Commits August 2006

commits@lists.geany.org

3 participants
123 discussions

SF.net SVN: geany: [756] trunk/tagmanager/pascal.c
by eht16＠users.sourceforge.net 23 Aug '06

23 Aug '06

Revision: 756 Author: eht16 Date: 2006-08-22 12:15:33 -0700 (Tue, 22 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=756&view=rev Log Message: ----------- Added recognition for keyword "type". Modified Paths: -------------- trunk/tagmanager/pascal.c Modified: trunk/tagmanager/pascal.c =================================================================== --- trunk/tagmanager/pascal.c 2006-08-22 19:03:38 UTC (rev 755) +++ trunk/tagmanager/pascal.c 2006-08-22 19:15:33 UTC (rev 756) @@ -246,6 +246,13 @@ kind = K_FUNCTION; } break; + case 't': + if (tail ("ype")) + { + get_tagname = TRUE; + kind = K_FUNCTION; + } + break; } } /* while not eof */ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [755] trunk
by eht16＠users.sourceforge.net 23 Aug '06

23 Aug '06

Revision: 755 Author: eht16 Date: 2006-08-22 12:03:38 -0700 (Tue, 22 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=755&view=rev Log Message: ----------- Save all VTE settings in an own VTE section in the configuration file instead of using an unhandy string list. Added new settings: ignore menu bar accelerator and define the shell which is started within the VTE. (Code not yet complete, might be buggy, GUI stuff is missing) Modified Paths: -------------- trunk/ChangeLog trunk/src/keyfile.c trunk/src/prefs.c trunk/src/utils.c trunk/src/vte.c trunk/src/vte.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-21 22:28:36 UTC (rev 754) +++ trunk/ChangeLog 2006-08-22 19:03:38 UTC (rev 755) @@ -1,3 +1,13 @@ +2006-08-22 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/vte.c, src/prefs.c, src/keyfile.c, src/utils.c: + Save all VTE settings in an own VTE section in the configuration + file instead of using an unhandy string list. + Added new settings: ignore menu bar accelerator and define the shell + which is started within the VTE. + (Code not yet complete, might be buggy, GUI stuff is missing) + + 2006-08-21 Enrico Tröger <enrico.troeger(a)uvena.de> * src/images.c, src/notebook.c: Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2006-08-21 22:28:36 UTC (rev 754) +++ trunk/src/keyfile.c 2006-08-22 19:03:38 UTC (rev 755) @@ -25,6 +25,12 @@ #include "geany.h" +#ifdef HAVE_VTE +#include <pwd.h> +#include <sys/types.h> +#include <unistd.h> +#endif + #include "support.h" #include "keyfile.h" #include "utils.h" @@ -109,12 +115,29 @@ g_key_file_set_boolean(config, PACKAGE, "auto_close_xml_tags", app->pref_editor_auto_close_xml_tags); g_key_file_set_boolean(config, PACKAGE, "auto_complete_constructs", app->pref_editor_auto_complete_constructs); #ifdef HAVE_VTE - g_key_file_set_boolean(config, PACKAGE, "load_vte", vte_info.load_vte); - g_key_file_set_comment(config, PACKAGE, "terminal_settings", - _(" VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on keystroke;scroll on output;follow path of file"), NULL); - g_key_file_set_string(config, PACKAGE, "terminal_settings", vte_info.terminal_settings); - vte_get_working_directory(); // refresh vte_info.dir - g_key_file_set_string(config, PACKAGE, "terminal_dir", vte_info.dir); + g_key_file_set_boolean(config, "VTE", "load_vte", vte_info.load_vte); + if (vte_info.load_vte) + { + gchar *tmp_string; + + g_key_file_set_string(config, "VTE", "emulation", vc->emulation); + g_key_file_set_string(config, "VTE", "font", vc->font); + g_key_file_set_boolean(config, "VTE", "scroll_on_key", vc->scroll_on_key); + g_key_file_set_boolean(config, "VTE", "scroll_on_out", vc->scroll_on_out); + g_key_file_set_boolean(config, "VTE", "ignore_menu_bar_accel", vc->ignore_menu_bar_accel); + g_key_file_set_boolean(config, "VTE", "follow_path", vc->follow_path); + g_key_file_set_integer(config, "VTE", "scrollback_lines", vc->scrollback_lines); + g_key_file_set_string(config, "VTE", "font", vc->font); + g_key_file_set_string(config, "VTE", "shell", vc->shell); + tmp_string = utils_get_hex_from_color(vc->colour_fore); + g_key_file_set_string(config, "VTE", "colour_fore", tmp_string); + g_free(tmp_string); + tmp_string = utils_get_hex_from_color(vc->colour_back); + g_key_file_set_string(config, "VTE", "colour_back", tmp_string); + g_free(tmp_string); + vte_get_working_directory(); // refresh vte_info.dir + g_key_file_set_string(config, "VTE", "last_dir", vte_info.dir); + } #endif g_key_file_set_string(config, PACKAGE, "custom_date_format", app->custom_date_format); g_key_file_set_string(config, PACKAGE, "editor_font", app->editor_font); @@ -324,9 +347,38 @@ app->pref_toolbar_show_colour = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_colour", TRUE); app->pref_toolbar_show_fileops = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_fileops", TRUE); #ifdef HAVE_VTE - vte_info.load_vte = utils_get_setting_boolean(config, PACKAGE, "load_vte", TRUE); - vte_info.terminal_settings = utils_get_setting_string(config, PACKAGE, "terminal_settings", ""); - vte_info.dir = utils_get_setting_string(config, PACKAGE, "terminal_dir", NULL); + vte_info.load_vte = utils_get_setting_boolean(config, "VTE", "load_vte", TRUE); + if (vte_info.load_vte) + { + struct passwd *pw = getpwuid(getuid()); + gchar *shell = (pw != NULL) ? pw->pw_shell : "/bin/sh"; + + vc = g_new0(VteConfig, 1); + vte_info.dir = utils_get_setting_string(config, "VTE", "last_dir", NULL); + if ((vte_info.dir == NULL || utils_strcmp(vte_info.dir, "")) && pw != NULL) + // last dir is not set, fallback to user's home directory + vte_info.dir = g_strdup(pw->pw_dir); + else if (vte_info.dir == NULL && pw == NULL) + // fallback to root + vte_info.dir = g_strdup("/"); + + vc->emulation = utils_get_setting_string(config, "VTE", "emulation", "xterm"); + vc->shell = utils_get_setting_string(config, "VTE", "shell", shell); + vc->font = utils_get_setting_string(config, "VTE", "font", "Monospace 10"); + vc->scroll_on_key = utils_get_setting_boolean(config, "VTE", "scroll_on_key", TRUE); + vc->scroll_on_out = utils_get_setting_boolean(config, "VTE", "scroll_on_out", TRUE); + vc->ignore_menu_bar_accel = utils_get_setting_boolean(config, "VTE", "ignore_menu_bar_accel", FALSE); + vc->follow_path = utils_get_setting_boolean(config, "VTE", "follow_path", FALSE); + vc->scrollback_lines = utils_get_setting_integer(config, "VTE", "scrollback_lines", 500); + vc->colour_fore = g_new0(GdkColor, 1); + vc->colour_back = g_new0(GdkColor, 1); + tmp_string = utils_get_setting_string(config, "VTE", "colour_fore", "#ffffff"); + gdk_color_parse(tmp_string, vc->colour_fore); + g_free(tmp_string); + tmp_string = utils_get_setting_string(config, "VTE", "colour_back", "#000000"); + gdk_color_parse(tmp_string, vc->colour_back); + g_free(tmp_string); + } #endif app->pref_template_developer = utils_get_setting_string(config, PACKAGE, "pref_template_developer", g_get_real_name()); app->pref_template_company = utils_get_setting_string(config, PACKAGE, "pref_template_company", ""); Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2006-08-21 22:28:36 UTC (rev 754) +++ trunk/src/prefs.c 2006-08-22 19:03:38 UTC (rev 755) @@ -331,10 +331,10 @@ gtk_font_button_set_font_name(GTK_FONT_BUTTON(widget), vc->font); widget = lookup_widget(app->prefs_dialog, "color_fore"); - gtk_color_button_set_color(GTK_COLOR_BUTTON(widget), vc->color_fore); + gtk_color_button_set_color(GTK_COLOR_BUTTON(widget), vc->colour_fore); widget = lookup_widget(app->prefs_dialog, "color_back"); - gtk_color_button_set_color(GTK_COLOR_BUTTON(widget), vc->color_back); + gtk_color_button_set_color(GTK_COLOR_BUTTON(widget), vc->colour_back); widget = lookup_widget(app->prefs_dialog, "spin_scrollback"); gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), vc->scrollback_lines); @@ -573,8 +573,6 @@ // VTE settings if (vte_info.have_vte) { - gchar *hex_color_back, *hex_color_fore; - widget = lookup_widget(app->prefs_dialog, "spin_scrollback"); vc->scrollback_lines = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); @@ -591,18 +589,7 @@ widget = lookup_widget(app->prefs_dialog, "check_follow_path"); vc->follow_path = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - g_free(vte_info.terminal_settings); - hex_color_fore = utils_get_hex_from_color(vc->color_fore); - hex_color_back = utils_get_hex_from_color(vc->color_back); - vte_info.terminal_settings = g_strdup_printf("%s;%s;%s;%d;%s;%s;%s;%s", vc->font, - hex_color_fore, hex_color_back, - vc->scrollback_lines, vc->emulation, - utils_btoa(vc->scroll_on_key), utils_btoa(vc->scroll_on_out), - utils_btoa(vc->follow_path)); - vte_apply_user_settings(); - g_free(hex_color_fore); - g_free(hex_color_back); } #endif @@ -657,16 +644,16 @@ #ifdef HAVE_VTE case 2: { - g_free(vc->color_fore); - vc->color_fore = g_new0(GdkColor, 1); - gtk_color_button_get_color(widget, vc->color_fore); + g_free(vc->colour_fore); + vc->colour_fore = g_new0(GdkColor, 1); + gtk_color_button_get_color(widget, vc->colour_fore); break; } case 3: { - g_free(vc->color_back); - vc->color_back = g_new0(GdkColor, 1); - gtk_color_button_get_color(widget, vc->color_back); + g_free(vc->colour_back); + vc->colour_back = g_new0(GdkColor, 1); + gtk_color_button_get_color(widget, vc->colour_back); break; } #endif Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-08-21 22:28:36 UTC (rev 754) +++ trunk/src/utils.c 2006-08-22 19:03:38 UTC (rev 755) @@ -1944,6 +1944,8 @@ { gchar *buffer = g_malloc0(9); + if (color == NULL) return NULL; + g_snprintf(buffer, 8, "#%02X%02X%02X", (guint) (utils_scale_round(color->red / 256, 255)), (guint) (utils_scale_round(color->green / 256, 255)), Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2006-08-21 22:28:36 UTC (rev 754) +++ trunk/src/vte.c 2006-08-22 19:03:38 UTC (rev 755) @@ -25,8 +25,6 @@ #ifdef HAVE_VTE #include <gdk/gdkkeysyms.h> -#include <pwd.h> -#include <unistd.h> #include <signal.h> #include <string.h> @@ -43,7 +41,7 @@ extern gchar **environ; static pid_t pid; static GModule *module = NULL; -static struct vte_funcs *vf; +static struct VteFunctions *vf; static gboolean popup_menu_created = FALSE; @@ -54,7 +52,6 @@ static gboolean vte_button_pressed(GtkWidget *widget, GdkEventButton *event, gpointer user_data); static gboolean vte_keypress(GtkWidget *widget, GdkEventKey *event, gpointer data); static void vte_register_symbols(GModule *module); -static void vte_get_settings(void); static void vte_popup_menu_clicked(GtkMenuItem *menuitem, gpointer user_data); static GtkWidget *vte_create_popup_menu(void); static void vte_char_size_changed(VteTerminal *vteterminal, guint arg1, guint arg2, @@ -132,8 +129,7 @@ else { vte_info.have_vte = TRUE; - vf = g_new0(struct vte_funcs, 1); - vc = g_new0(struct vte_conf, 1); + vf = g_new0(struct VteFunctions, 1); vte_register_symbols(module); } @@ -149,8 +145,6 @@ gtk_box_pack_start(GTK_BOX(hbox), vte, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), scrollbar, FALSE, FALSE, 0); - vte_get_settings(); - vf->vte_terminal_set_size(VTE_TERMINAL(vte), 30, 1); //vf->vte_terminal_set_encoding(VTE_TERMINAL(vte), "UTF-8"); vf->vte_terminal_set_mouse_autohide(VTE_TERMINAL(vte), TRUE); @@ -187,8 +181,8 @@ if (popup_menu_created) gtk_widget_destroy(vc->menu); g_free(vc->font); g_free(vc->emulation); - g_free(vc->color_back); - g_free(vc->color_fore); + g_free(vc->colour_back); + g_free(vc->colour_fore); g_free(vc); g_module_close(module); } @@ -219,26 +213,11 @@ static void vte_start(GtkWidget *widget) { VteTerminal *vte = VTE_TERMINAL(widget); - struct passwd *pw; - const gchar *shell; - const gchar *dir = NULL; gchar **env; - pw = getpwuid(getuid()); - if (pw) - { - shell = pw->pw_shell; - dir = pw->pw_dir; - } - else - { - shell = "/bin/sh"; - dir = "/"; - } - env = vte_get_child_environment(); - pid = vf->vte_terminal_fork_command(VTE_TERMINAL(vte), shell, NULL, env, - (vte_info.dir == NULL) ? dir : vte_info.dir, TRUE, TRUE, TRUE); + pid = vf->vte_terminal_fork_command(VTE_TERMINAL(vte), vc->shell, NULL, env, + vte_info.dir, TRUE, TRUE, TRUE); g_strfreev(env); } @@ -307,37 +286,12 @@ vf->vte_terminal_set_scroll_on_output(VTE_TERMINAL(vc->vte), vc->scroll_on_out); vf->vte_terminal_set_emulation(VTE_TERMINAL(vc->vte), vc->emulation); vf->vte_terminal_set_font_from_string(VTE_TERMINAL(vc->vte), vc->font); - vf->vte_terminal_set_color_foreground(VTE_TERMINAL(vc->vte), vc->color_fore); - vf->vte_terminal_set_color_background(VTE_TERMINAL(vc->vte), vc->color_back); -} + vf->vte_terminal_set_color_foreground(VTE_TERMINAL(vc->vte), vc->colour_fore); + vf->vte_terminal_set_color_background(VTE_TERMINAL(vc->vte), vc->colour_back); - -static void vte_get_settings(void) -{ - gchar **values = g_strsplit(vte_info.terminal_settings, ";", 8); - - if (g_strv_length(values) != 8) - { - vte_info.terminal_settings = - g_strdup_printf("Monospace 10;#FFFFFF;#000000;500;xterm;true;true;false"); - values = g_strsplit(vte_info.terminal_settings, ";", 8); - } - vc->font = g_strdup(values[0]); - vc->color_fore = g_new0(GdkColor, 1); - vc->color_back = g_new0(GdkColor, 1); - gdk_color_parse(values[1], vc->color_fore); - gdk_color_parse(values[2], vc->color_back); - - vc->scrollback_lines = strtod(values[3], NULL); - if ((vc->scrollback_lines < 0) || (vc->scrollback_lines > 5000)) vc->scrollback_lines = 500; - - vc->emulation = g_strdup(values[4]); - - vc->scroll_on_key = utils_atob(values[5]); - vc->scroll_on_out = utils_atob(values[6]); - vc->follow_path = utils_atob(values[7]); - - g_strfreev(values); + if (vc->ignore_menu_bar_accel) + gtk_settings_set_string_property(gtk_settings_get_default(), "gtk-menu-bar-accel", + "<Shift><Control><Mod1><Mod2><Mod3><Mod4><Mod5>F10", "Geany"); } @@ -488,4 +442,5 @@ } */ + #endif Modified: trunk/src/vte.h =================================================================== --- trunk/src/vte.h 2006-08-21 22:28:36 UTC (rev 754) +++ trunk/src/vte.h 2006-08-22 19:03:38 UTC (rev 755) @@ -31,16 +31,34 @@ #ifdef HAVE_VTE -typedef struct +typedef struct { gboolean load_vte; gboolean have_vte; gchar *lib_vte; - gchar *terminal_settings; gchar *dir; } VteInfo; extern VteInfo vte_info; + + +typedef struct +{ + GtkWidget *vte; + GtkWidget *menu; + GtkWidget *im_submenu; + gboolean scroll_on_key; + gboolean scroll_on_out; + gboolean ignore_menu_bar_accel; + gboolean follow_path; + gint scrollback_lines; + gchar *emulation; + gchar *shell; + gchar *font; + GdkColor *colour_fore; + GdkColor *colour_back; +} VteConfig; +VteConfig *vc; #endif @@ -80,26 +98,9 @@ }; -struct vte_conf -{ - GtkWidget *vte; - GtkWidget *menu; - GtkWidget *im_submenu; - gboolean scroll_on_key; - gboolean scroll_on_out; - gboolean follow_path; - gint scrollback_lines; - gchar *emulation; - gchar *font; - GdkColor *color_fore; - GdkColor *color_back; -}; -struct vte_conf *vc; - - /* store function pointers in a struct to avoid a strange segfault if they are stored directly * if accessed directly, gdb says the segfault arrives at old_tab_width(prefs.c), don't ask me */ -struct vte_funcs +struct VteFunctions { GtkWidget* (*vte_terminal_new) (void); pid_t (*vte_terminal_fork_command) (VteTerminal *terminal, const char *command, char **argv, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [754] trunk/po
by kretek＠users.sourceforge.net 22 Aug '06

22 Aug '06

Revision: 754 Author: kretek Date: 2006-08-21 15:28:36 -0700 (Mon, 21 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=754&view=rev Log Message: ----------- Update of German translation and catalog Modified Paths: -------------- trunk/po/ChangeLog trunk/po/de.po trunk/po/geany.pot Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2006-08-21 17:21:50 UTC (rev 753) +++ trunk/po/ChangeLog 2006-08-21 22:28:36 UTC (rev 754) @@ -1,3 +1,9 @@ +2006-08-22 Frank Lanitz <frank(a)frank.uvena.de> + + * geany.pot: Update of catalog + * de.po: Update of German translation + + 2006-08-06 Enrico Tröger <enrico.troeger(a)uvena.de> * de.po: Fixed small mnemonic error in German translation. Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2006-08-21 17:21:50 UTC (rev 753) +++ trunk/po/de.po 2006-08-21 22:28:36 UTC (rev 754) @@ -7,9 +7,9 @@ msgstr "" "Project-Id-Version: geany 0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-02 11:35+0200\n" -"PO-Revision-Date: 2006-08-02 12:45+0100\n" -"Last-Translator: Enrico Tröger <enrico.troeger(a)uvena.de>\n" +"POT-Creation-Date: 2006-08-21 22:43+0200\n" +"PO-Revision-Date: 2006-08-21 23:20+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" "Content-Type: text/plain; charset=utf-8\n" @@ -20,39 +20,44 @@ "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-Basepath: /home/enrico/src/geany/\n" -#: src/main.c:76 +#: src/main.c:86 msgid "runs in debug mode (means being verbose)" msgstr "Geany im Debug-Modus ausführen (Gesprächig!)" -#: src/main.c:77 +#: src/main.c:87 msgid "don't load auto completion data (see documentation)" msgstr "Autovervollständigungsdaten nicht laden " -#: src/main.c:79 +#: src/main.c:89 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:81 +#: src/main.c:91 msgid "use an alternate configuration directory" msgstr "Benutzt ein anderes Verzeichnis für die Konfigurationsdateien" -#: src/main.c:82 +#: src/main.c:92 msgid "don't show message window at startup" msgstr "Kein Meldungsfenster beim Starten anzeigen" -#: src/main.c:84 +#: src/main.c:94 msgid "don't load terminal support" msgstr "Die virtual terminal emulation (VTE) nicht starten" -#: src/main.c:85 +#: src/main.c:95 msgid "filename of libvte.so" msgstr "Name der libvte.so" -#: src/main.c:87 +#: src/main.c:97 msgid "show version and exit" msgstr "Versionsinformation anzeigen und Programm beenden" -#: src/main.c:428 +#: src/main.c:382 +#, c-format +msgid "Could not find file \"%s\".\n" +msgstr "Konnte die Datei \"%s\" nicht finden. \n" + +#: src/main.c:416 msgid "" "Geany is exiting because a named pipe was found. Mostly this means, Geany is already running. If you know Geany is not running, you can delete the file and start Geany anyway.\n" "Delete the named pipe and start Geany?" @@ -60,16 +65,16 @@ "Geany wird beendet, da ein FIFO (named pipe) gefunden wurde. Das bedeutet meistens, dass Geany bereits läuft. Wenn Sie genau wissen, dass Geany nicht läuft, können Sie die Datei löschen und Geany trotzdem starten.\n" "Die Datei löschen und Geany starten?" -#: src/main.c:491 +#: src/main.c:506 msgid " - A fast and lightweight IDE" msgstr " - Eine kleine und schnelle Entwicklungsumgebung" -#: src/main.c:501 +#: src/main.c:516 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(kompiliert am %s mit GTK %d.%d.%d, GLib %d.%d.%d)" -#: src/main.c:524 +#: src/main.c:558 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -80,988 +85,1005 @@ "Es können einige Probleme in Geany ohne ein Konfigurationsverzeichnis auftreten.\n" "Geany trotzdem starten?" -#: src/main.c:591 +#: src/main.c:654 #, c-format msgid "This is Geany %s." msgstr "Willkommen zu Geany %s." -#: src/main.c:593 +#: src/main.c:656 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Konfigurationsverzeichnis konnte nicht erstellt werden (%s)." -#: src/main.c:617 -#: src/callbacks.c:838 -#: src/dialogs.c:150 -#: src/document.c:367 -#: src/document.c:400 +#: src/main.c:681 +#: src/callbacks.c:840 +#: src/dialogs.c:146 +#: src/document.c:364 +#: src/document.c:397 #: src/win32.c:150 #, 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:236 -#: src/interface.c:1346 +#: src/interface.c:240 +#: src/interface.c:1364 msgid "Geany" msgstr "Geany" -#: src/interface.c:246 +#: src/interface.c:250 msgid "_File" msgstr "_Datei" -#: src/interface.c:257 +#: src/interface.c:261 msgid "New (with _template)" msgstr "Neu (aus _Vorlage)" -#: src/interface.c:268 -#: src/interface.c:287 -#: src/interface.c:331 -#: src/interface.c:442 -#: src/interface.c:714 -#: src/interface.c:724 -#: src/interface.c:1778 +#: 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 msgid "invisible" msgstr "invisible" -#: src/interface.c:280 +#: src/interface.c:284 msgid "Recent _files" msgstr "Z_uletzt geöffnet" -#: src/interface.c:303 +#: src/interface.c:307 msgid "Save a_ll" msgstr "A_lle speichern" -#: src/interface.c:306 +#: src/interface.c:310 msgid "Saves all open files" msgstr "Speichert alle offenen Dateien" -#: src/interface.c:312 +#: src/interface.c:316 +#: src/callbacks.c:509 +#: src/utils.c:965 msgid "_Reload" msgstr "_Neu laden" -#: src/interface.c:320 +#: src/interface.c:324 msgid "R_eload as" msgstr "N_eu laden als" -#: src/interface.c:351 +#: src/interface.c:355 msgid "Prints the current file" msgstr "Druckt die aktuelle Datei" -#: src/interface.c:362 +#: src/interface.c:366 msgid "C_lose all" msgstr "_Alle schließen" -#: src/interface.c:365 +#: src/interface.c:369 msgid "Closes all open files" msgstr "Schließt alle offenen Dateien" -#: src/interface.c:379 -#: src/interface.c:955 +#: src/interface.c:383 +#: src/interface.c:973 msgid "Quit Geany" msgstr "Geany beenden" -#: src/interface.c:381 +#: src/interface.c:385 msgid "_Edit" msgstr "_Bearbeiten" -#: src/interface.c:422 -#: src/interface.c:1741 +#: src/interface.c:426 +#: src/interface.c:1765 msgid "Select _All" msgstr "A_lles auswählen" -#: src/interface.c:431 +#: src/interface.c:435 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" ei_nfügen" -#: src/interface.c:445 +#: src/interface.c:449 msgid "I_nsert Comments" msgstr "K_ommentare einfügen" -#: src/interface.c:456 -#: src/interface.c:1792 +#: src/interface.c:460 +#: src/interface.c:1816 msgid "Insert ChangeLog entry" msgstr "ChangeLog-Eintrag hinzufügen" -#: src/interface.c:459 +#: src/interface.c:463 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:461 -#: src/interface.c:1797 +#: src/interface.c:465 +#: src/interface.c:1821 msgid "Insert file header" msgstr "Dateikopf einfügen" -#: src/interface.c:464 -#: src/interface.c:1800 +#: src/interface.c:468 +#: src/interface.c:1824 msgid "Inserts a few information at the beginning of the file" msgstr "Fügt einen Dateiopf am Anfang einer neu erzeugten Datei ein" -#: src/interface.c:466 -#: src/interface.c:1802 +#: src/interface.c:470 +#: src/interface.c:1826 msgid "Insert function description" msgstr "Funktionsbeschreibung einfügen" -#: src/interface.c:469 -#: src/interface.c:1805 +#: src/interface.c:473 +#: src/interface.c:1829 msgid "Inserts a description before the current function" msgstr "Fügt eine Funktionsbeschreibung vor der Funktion ein." -#: src/interface.c:471 -#: src/interface.c:1807 +#: src/interface.c:475 +#: src/interface.c:1831 msgid "Insert multiline comment" msgstr "Mehrzeiligen Kommentar einfügen" -#: src/interface.c:474 -#: src/interface.c:1810 +#: src/interface.c:478 +#: src/interface.c:1834 msgid "Inserts a multiline comment" msgstr "Fügt einen mehrzeiligen Kommentar ein." -#: src/interface.c:476 -#: src/interface.c:1812 +#: src/interface.c:480 +#: src/interface.c:1836 msgid "Insert GPL notice" msgstr "GPL-Hinweis am Dateianfang einfügen" -#: src/interface.c:479 -#: src/interface.c:1815 +#: src/interface.c:483 +#: src/interface.c:1839 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:486 -#: src/interface.c:1822 +#: src/interface.c:485 +#: src/interface.c:1841 +msgid "Insert Dat_e" +msgstr "Datum einfügen" + +#: src/interface.c:500 +#: src/interface.c:1856 msgid "_Format" msgstr "_Format" -#: src/interface.c:489 +#: src/interface.c:503 msgid "Convert the case of the current selection" msgstr "Ändert die Großschreibung der aktuellen Auswahl" -#: src/interface.c:494 -#: src/interface.c:1829 +#: src/interface.c:508 +#: src/interface.c:1863 msgid "Convert Selection to _lower-case" msgstr "Auswahl in _Kleinbuchstaben umwandeln" -#: src/interface.c:498 -#: src/interface.c:1833 +#: src/interface.c:512 +#: src/interface.c:1867 msgid "Convert Selection to _upper-case" msgstr "Auswahl in _Großbuchstaben umwandeln" -#: src/interface.c:507 -#: src/interface.c:1842 +#: src/interface.c:521 +#: src/interface.c:1876 msgid "_Comment Line" msgstr "Zeile _auskommentieren" -#: src/interface.c:511 -#: src/interface.c:1846 +#: src/interface.c:525 +#: src/interface.c:1880 msgid "_Uncomment Line" msgstr "Zeile _einkommentieren" -#: src/interface.c:515 -#: src/interface.c:1850 +#: src/interface.c:529 +#: src/interface.c:1884 msgid "D_uplicate Line" msgstr "_Zeile oder Auswahl kopieren" -#: src/interface.c:524 -#: src/interface.c:1859 +#: src/interface.c:538 +#: src/interface.c:1893 msgid "_Increase Indent" msgstr "Einzug _erhöhen" -#: src/interface.c:528 -#: src/interface.c:1863 +#: src/interface.c:542 +#: src/interface.c:1897 msgid "_Decrease Indent" msgstr "Einzug _verringern" -#: src/interface.c:532 +#: src/interface.c:546 msgid "Count _words" msgstr "Wörter _zählen" -#: src/interface.c:535 +#: src/interface.c:549 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:546 +#: src/interface.c:560 msgid "_Search" msgstr "_Suchen" -#: src/interface.c:557 +#: src/interface.c:571 msgid "Find _Next" msgstr "_Nächstes" -#: src/interface.c:561 +#: src/interface.c:575 msgid "Find _Previous" msgstr "_Vorheriges" -#: src/interface.c:565 -#: src/dialogs.c:926 +#: src/interface.c:579 +#: src/search.c:278 msgid "_Replace" msgstr "_Ersetzen" -#: src/interface.c:578 +#: src/interface.c:592 msgid "Find in f_iles" msgstr "In _Dateien suchen" -#: src/interface.c:587 +#: src/interface.c:601 msgid "_Go to line" msgstr "Gehe zu _Zeile" -#: src/interface.c:595 -#: src/dialogs.c:73 +#: src/interface.c:609 +#: src/dialogs.c:70 msgid "_View" msgstr "_Ansicht" -#: src/interface.c:602 +#: src/interface.c:616 msgid "Change _Font" msgstr "_Schriftart ändern" -#: src/interface.c:605 +#: src/interface.c:619 msgid "Change the default font" msgstr "Ändert die Standardschriftart für das Editor-Fenster" -#: src/interface.c:611 +#: src/interface.c:625 msgid "Show _Colour Chooser" msgstr "_Farbwähler öffnen" -#: src/interface.c:614 -#: src/interface.c:894 +#: src/interface.c:628 +#: src/interface.c:912 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:625 +#: src/interface.c:639 msgid "Full_screen" msgstr "_Vollbild" -#: src/interface.c:629 +#: src/interface.c:643 msgid "Show Messages _Window" msgstr "_Meldungsfenster anzeigen" -#: src/interface.c:632 +#: src/interface.c:646 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:635 +#: src/interface.c:649 msgid "Show _Toolbar" msgstr "_Werkzeugleiste anzeigen" -#: src/interface.c:638 +#: src/interface.c:652 msgid "Toggle the toolbar on and off" msgstr "Schaltet die Anzeige der Werkzeugleiste an und aus." -#: src/interface.c:641 +#: src/interface.c:655 msgid "Show Side_bar" msgstr "Seiten_leiste anzeigen" -#: src/interface.c:646 +#: src/interface.c:660 msgid "Show _Markers Margin" msgstr "M_arkierungsrand anzeigen" -#: src/interface.c:649 +#: src/interface.c:663 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:652 +#: src/interface.c:666 msgid "Show _Line Numbers" msgstr "_Zeilennummern anzeigen" -#: src/interface.c:655 +#: src/interface.c:669 msgid "Shows or hides the Line Number margin." msgstr "Zeigt oder versteckt den Zeilennummernrand." -#: src/interface.c:675 +#: src/interface.c:689 msgid "_Document" msgstr "D_okument" -#: src/interface.c:682 +#: src/interface.c:696 msgid "_Line wrapping" msgstr "Zeilenu_mbruch" -#: src/interface.c:685 -#: src/interface.c:2949 +#: src/interface.c:699 +#: src/interface.c:2990 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:688 +#: src/interface.c:702 msgid "_Use auto indentation" msgstr "Automatische _Einrückung benutzen" -#: src/interface.c:693 +#: src/interface.c:707 msgid "Read _only" msgstr "_Schreibgeschützt" -#: src/interface.c:696 +#: src/interface.c:710 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:698 +#: src/interface.c:712 msgid "_Write Unicode BOM" msgstr "_Unicode BOM schreiben" -#: src/interface.c:707 +#: src/interface.c:721 msgid "Set file_type" msgstr "Datei_typ festlegen" -#: src/interface.c:717 +#: src/interface.c:731 msgid "Set _encoding" msgstr "Zeichen_kodierung festlegen" -#: src/interface.c:727 +#: src/interface.c:741 msgid "Set line e_ndings" msgstr "_Zeilenenden anzeigen" -#: src/interface.c:734 +#: src/interface.c:748 msgid "Convert and set to _CR/LF (Win)" msgstr "Auf _CR/LF setzen umwandeln (Win)" -#: src/interface.c:738 +#: src/interface.c:753 msgid "Convert and set to _LF (Unix)" msgstr "Auf _LF setzen und umwandeln (Unix)" -#: src/interface.c:742 +#: src/interface.c:758 msgid "Convert and set to CR (_Mac)" msgstr "Auf CR setzen umwandeln (_Mac)" -#: src/interface.c:751 +#: src/interface.c:769 msgid "_Replace tabs by spaces" msgstr "_Tabulatoren durch Leerzeichen ersetzen" -#: src/interface.c:754 -#: src/interface.c:2882 +#: src/interface.c:772 +#: src/interface.c:2923 msgid "Replaces all tabs in document by spaces." msgstr "Ersetzt alle Tabulatoren im Dokument durch Leerzeichen" -#: src/interface.c:761 +#: src/interface.c:779 msgid "_Fold all" msgstr "Alle _einklappen" -#: src/interface.c:764 +#: src/interface.c:782 msgid "Folds all contractible code blocks" msgstr "Klappt alle ausblendbaren Codeblöcke ein" -#: src/interface.c:766 +#: src/interface.c:784 msgid "_Unfold all" msgstr "Alle _ausklappen" -#: src/interface.c:769 +#: src/interface.c:787 msgid "Unfolds all contracted code blocks" msgstr "Klappt alle ausgeblendeten Codeblöcke wieder aus" -#: src/interface.c:776 +#: src/interface.c:794 msgid "Remove all _indicators" msgstr "Alle _Markierungen löschen" -#: src/interface.c:779 +#: src/interface.c:797 msgid "Removes all set indicators in the current document." msgstr "Entfernt alle gesetzten Markierungen innerhalb des Dokumentes." #. build the code -#: src/interface.c:781 -#: src/dialogs.c:490 +#: src/interface.c:799 +#: src/dialogs.c:485 msgid "_Build" msgstr "_Erstellen" -#: src/interface.c:785 +#: src/interface.c:803 msgid "_Help" msgstr "_Hilfe" -#: src/interface.c:796 +#: src/interface.c:814 msgid "_Keyboard shortcuts" msgstr "_Tastenkürzel" -#: src/interface.c:799 +#: src/interface.c:817 msgid "Shows a list of all keyboard shortcuts for Geany." msgstr "Zeige eine Übersicht mit allen Tastenkürzeln für Geany." -#: src/interface.c:801 +#: src/interface.c:819 msgid "_Website" msgstr "_Webseite" -#: src/interface.c:824 +#: src/interface.c:842 msgid "Create a new file" msgstr "Neue Datei anlegen" -#: src/interface.c:829 +#: src/interface.c:847 msgid "Open an existing file" msgstr "Öffnet eine existierende Datei" -#: src/interface.c:834 +#: src/interface.c:852 msgid "Save the current file" msgstr "Speichert die aktuelle Datei" -#: src/interface.c:836 +#: src/interface.c:854 #: src/keybindings.c:121 msgid "Save all" msgstr "Alle speichern" -#: src/interface.c:839 +#: src/interface.c:857 msgid "Save all open files" msgstr "Speichere alle offenen Dateien" -#: src/interface.c:848 +#: src/interface.c:866 msgid "Reload the current file from disk" msgstr "Liest die aktuelle Datei neu ein." -#: src/interface.c:853 +#: src/interface.c:871 msgid "Close the current file" msgstr "Schließt die aktuelle Datei" -#: src/interface.c:862 +#: src/interface.c:880 msgid "Undo the last modification" msgstr "Macht die letzte Änderung rückgängig." -#: src/interface.c:867 +#: src/interface.c:885 msgid "Redo the last modification" msgstr "Wiederholt die letzte Änderung." -#: src/interface.c:875 -#: src/keybindings.c:167 +#: src/interface.c:893 +#: src/keybindings.c:169 msgid "Compile" msgstr "Kompilieren" -#: src/interface.c:878 +#: src/interface.c:896 msgid "Compile the current file" msgstr "Kompiliert die aktuelle Datei" -#: src/interface.c:883 -#: src/dialogs.c:543 +#: src/interface.c:901 +#: src/dialogs.c:538 msgid "Run or view the current file" msgstr "Aktuelle Datei anzeigen oder ausführen" -#: src/interface.c:891 +#: src/interface.c:909 msgid "Color" msgstr "Farbwähler" -#: src/interface.c:903 +#: src/interface.c:921 msgid "Zoom in the text" msgstr "Text vergrößern" -#: src/interface.c:908 +#: src/interface.c:926 msgid "Zoom out the text" msgstr "Text verkleinern" -#: src/interface.c:921 -#: src/interface.c:926 +#: src/interface.c:939 +#: src/interface.c:944 msgid "Find the entered text in the current file" msgstr "Findet den eingegebenen Text im aktuellen Dokument" -#: src/interface.c:939 +#: src/interface.c:957 msgid "Enter a line number and jump to it." msgstr "Geben Sie die Zeile an, zu der Sie springen möchten." -#: src/interface.c:946 +#: src/interface.c:964 msgid "Jump to the entered line number." msgstr "Springe zu angegebener Zeile" -#: src/interface.c:982 +#: src/interface.c:1000 #: src/treeviews.c:41 msgid "Symbols" msgstr "Symbole" -#: src/interface.c:995 +#: src/interface.c:1013 #: src/treeviews.c:208 msgid "Open files" msgstr "Geöffnete Dateien" -#: src/interface.c:1030 +#: src/interface.c:1048 msgid "Status" msgstr "Status" -#: src/interface.c:1044 +#: src/interface.c:1062 msgid "Compiler" msgstr "Compiler" -#: src/interface.c:1058 +#: src/interface.c:1076 msgid "Messages" msgstr "Meldungen" -#: src/interface.c:1071 +#: src/interface.c:1089 msgid "Scribble" msgstr "Notizen" -#: src/interface.c:1568 -#: src/interface.c:2723 +#: src/interface.c:1589 +#: src/interface.c:2764 msgid "Images and text" msgstr "Icons und Text" -#: src/interface.c:1574 -#: src/interface.c:2731 +#: src/interface.c:1595 +#: src/interface.c:2772 msgid "Images only" msgstr "Nur Icons" -#: src/interface.c:1580 -#: src/interface.c:2739 +#: src/interface.c:1601 +#: src/interface.c:2780 msgid "Text only" msgstr "Nur Text" -#: src/interface.c:1591 -#: src/interface.c:2747 +#: src/interface.c:1612 +#: src/interface.c:2788 msgid "Large icons" msgstr "Große Symbole" -#: src/interface.c:1596 -#: src/interface.c:2755 +#: src/interface.c:1617 +#: src/interface.c:2796 msgid "Small icons" msgstr "Kleine Symbole" -#: src/interface.c:1606 +#: src/interface.c:1627 msgid "Hide toolbar" msgstr "Toolbar verbergen" -#: src/interface.c:1767 +#: src/interface.c:1791 msgid "Insert \"include <...>\"" msgstr "\"include <...>\" einfügen" -#: src/interface.c:1781 +#: src/interface.c:1805 msgid "Insert Comments" msgstr "Kommentare einfügen" -#: src/interface.c:1795 +#: src/interface.c:1819 msgid "Inserts a typical ChangeLog entry in the current " msgstr "ChangeLog-Eintrag hinzufügen" -#: src/interface.c:1872 +#: src/interface.c:1906 msgid "Find usage" msgstr "Auftreten finden" -#: src/interface.c:1880 -#: src/keybindings.c:222 +#: src/interface.c:1914 +#: src/keybindings.c:224 msgid "Go to tag definition" msgstr "Gehe zu Tag Definition" -#: src/interface.c:1884 -#: src/keybindings.c:224 +#: src/interface.c:1918 +#: src/keybindings.c:226 msgid "Go to tag declaration" msgstr "Gehe zu Tag Deklaration" -#: src/interface.c:1893 -#: src/dialogs.c:743 -#: src/keybindings.c:147 +#: src/interface.c:1927 +#: src/dialogs.c:739 +#: src/keybindings.c:149 msgid "Go to line" msgstr "Gehe zu Zeile" -#: src/interface.c:1896 +#: src/interface.c:1930 msgid "Goto to the entered line" msgstr "Springe zu angegebener Zeile" -#: src/interface.c:2228 -#: src/keybindings.c:137 +#: src/interface.c:2269 +#: src/keybindings.c:139 msgid "Preferences" msgstr "Einstellungen" -#: src/interface.c:2257 +#: src/interface.c:2298 msgid "Load files from the last session" msgstr "Dateien aus der letzten Sitzung laden" -#: src/interface.c:2261 +#: src/interface.c:2302 msgid "Opens at startup the files from the last session" msgstr "Lädt die geöffneten Dateien aus der letzten Sitzung" -#: src/interface.c:2264 +#: src/interface.c:2305 msgid "Save window position and geometry" msgstr "Fensterposition und -größe speichern" -#: src/interface.c:2268 +#: src/interface.c:2309 msgid "Saves the window position and geometry and restores it at the start" msgstr "Speichert die Fensterposition und -größe" -#: src/interface.c:2271 +#: src/interface.c:2312 msgid "Beep on errors or when compilation has finished" msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" -#: src/interface.c:2274 +#: src/interface.c:2315 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:2277 +#: src/interface.c:2318 msgid "Switch to status message list at new message" msgstr "Wechsele zum Statusmeldungsfenster bei neuer Meldung" -#: src/interface.c:2280 +#: src/interface.c:2321 msgid "Switch to the status message tab(in the notebook window at the bottom) if a new status message arrive." msgstr "Automatisch zu dem Statusmeldungs-Reiter im unteren Fenster wechseln, wenn eine neue Statusmeldung vorliegt." -#: src/interface.c:2283 +#: src/interface.c:2324 msgid "Load virtual terminal emulation at startup" msgstr "Starte die Virtual Terminal Emulation beim Starten" -#: src/interface.c:2285 +#: src/interface.c:2326 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:2288 +#: src/interface.c:2329 msgid "Confirm exit" msgstr "Beenden bestätigen" -#: src/interface.c:2292 +#: src/interface.c:2333 msgid "Shows a confirmation dialog on exit." msgstr "Zeigt einen Bestätigungsdialog vor dem Beenden." -#: src/interface.c:2303 +#: src/interface.c:2344 msgid "Recent files list length:" msgstr "Anzahl der \"Zuletzt geöffneten\" Dateien" -#: src/interface.c:2311 +#: src/interface.c:2352 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:2319 +#: src/interface.c:2360 msgid "Placement of new file tabs: " msgstr "Platzierung neuer Dateien:" -#: src/interface.c:2323 -#: src/interface.c:2579 -#: src/interface.c:2589 -#: src/interface.c:2599 +#: src/interface.c:2364 +#: src/interface.c:2620 +#: src/interface.c:2630 +#: src/interface.c:2640 msgid "Left" msgstr "Links" -#: src/interface.c:2326 +#: src/interface.c:2367 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:2335 -#: src/interface.c:2580 -#: src/interface.c:2590 -#: src/interface.c:2600 +#: src/interface.c:2376 +#: src/interface.c:2621 +#: src/interface.c:2631 +#: src/interface.c:2641 msgid "Right" msgstr "Rechts" -#: src/interface.c:2338 +#: src/interface.c:2379 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:2347 +#: src/interface.c:2388 msgid "General" msgstr "Allgemein" -#: src/interface.c:2369 +#: src/interface.c:2410 msgid "Show symbol list" msgstr "Symbol-Ansicht anzeigen" -#: src/interface.c:2372 -#: src/interface.c:2378 +#: src/interface.c:2413 +#: src/interface.c:2419 msgid "Toggle the symbol list on and off" msgstr "Schaltet die Symbol-Ansicht ein und aus." -#: src/interface.c:2375 +#: src/interface.c:2416 msgid "Show open files list" msgstr "Zeige Liste mit geöffneten Dateien" -#: src/interface.c:2381 +#: src/interface.c:2422 msgid "Sidebar" msgstr "Seitenleiste" -#: src/interface.c:2402 +#: src/interface.c:2443 msgid "Symbol list font" msgstr "Schriftart der Symbol-Liste" -#: src/interface.c:2409 +#: src/interface.c:2450 msgid "Message window font" msgstr "Schriftart des Meldungsfenster" -#: src/interface.c:2421 +#: src/interface.c:2462 msgid "Sets the font for the message window" msgstr "Ändert die Schriftart für das Meldungsfenster" -#: src/interface.c:2429 +#: src/interface.c:2470 msgid "Sets the font for symbol list window" msgstr "Ändert die Schriftart für die Symbol-Ansicht" -#: src/interface.c:2432 +#: src/interface.c:2473 msgid "Editor font" msgstr "Editor-Schriftart" -#: src/interface.c:2444 +#: src/interface.c:2485 msgid "Sets the font for the editors windows" msgstr "Ändert die Schriftart des Editors" -#: src/interface.c:2446 +#: src/interface.c:2487 msgid "Fonts" msgstr "Schriftarten" -#: src/interface.c:2467 +#: src/interface.c:2508 msgid "Long line marker" msgstr "Long line marker" -#: src/interface.c:2474 +#: src/interface.c:2515 msgid "Long line marker color" msgstr "Long line marker Farbe" -#: src/interface.c:2487 +#: src/interface.c:2528 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:2491 +#: src/interface.c:2532 msgid "Type" msgstr "Typ" -#: src/interface.c:2504 +#: src/interface.c:2545 msgid "Line" msgstr "Linie" -#: src/interface.c:2507 +#: src/interface.c:2548 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:2511 +#: src/interface.c:2552 msgid "Background" msgstr "Hintergrund" -#: src/interface.c:2514 +#: src/interface.c:2555 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:2518 +#: src/interface.c:2559 msgid "Disabled" msgstr "Aus" -#: src/interface.c:2529 +#: src/interface.c:2570 msgid "Sets the color of the long line marker" msgstr "Stellt die Farbe des \"long line markers\" ein." -#: src/interface.c:2530 -#: src/dialogs.c:428 -#: src/prefs.c:993 -#: src/prefs.c:1000 +#: src/interface.c:2571 +#: src/dialogs.c:423 +#: src/prefs.c:988 +#: src/prefs.c:995 msgid "Color Chooser" msgstr "Farb-Wähler" -#: src/interface.c:2532 +#: src/interface.c:2573 msgid "Long line marker" msgstr "Long line marker" -#: src/interface.c:2553 -#: src/interface.c:2980 +#: src/interface.c:2594 +#: src/interface.c:3036 msgid "Editor" msgstr "Editor" -#: src/interface.c:2560 +#: src/interface.c:2601 msgid "Message window" msgstr "Meldungsfenster" -#: src/interface.c:2567 +#: src/interface.c:2608 msgid "Sidebar" msgstr "Seitenleiste" -#: src/interface.c:2581 -#: src/interface.c:2591 -#: src/interface.c:2601 +#: src/interface.c:2622 +#: src/interface.c:2632 +#: src/interface.c:2642 msgid "Top" msgstr "Oben" -#: src/interface.c:2582 -#: src/interface.c:2592 -#: src/interface.c:2602 +#: src/interface.c:2623 +#: src/interface.c:2633 +#: src/interface.c:2643 msgid "Bottom" msgstr "Unten" -#: src/interface.c:2604 +#: src/interface.c:2645 msgid "Tab placement" msgstr "Tab-Platzierung:" -#: src/interface.c:2609 +#: src/interface.c:2650 msgid "Interface" msgstr "Schnittstelle" -#: src/interface.c:2628 +#: src/interface.c:2669 msgid "Show Toolbar" msgstr "Werkzeugleiste anzeigen" -#: src/interface.c:2653 +#: src/interface.c:2694 msgid "Show file operation buttons" msgstr "Dateioperationssymbole anzeigen" -#: src/interface.c:2657 +#: src/interface.c:2698 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:2660 +#: src/interface.c:2701 msgid "Show Compile and Run" msgstr "Kompileren und Ausführen anzeigen" -#: src/interface.c:2664 +#: src/interface.c:2705 msgid "Display the Compile and Run buttons in the toolbar" msgstr "Zeigt die Kompilieren- und Ausführensymbole in der Werkzeugleiste." -#: src/interface.c:2667 +#: src/interface.c:2708 msgid "Show Colour Chooser button" msgstr "Farbwähler anzeigen" -#: src/interface.c:2671 +#: src/interface.c:2712 msgid "Display the Colour Chooser button in the toolbar" msgstr "Zeigt das Farbwählersymbol in der Werkzeugleiste." -#: src/interface.c:2674 +#: src/interface.c:2715 msgid "Show Zoom In and Zoom Out" msgstr "Heran- und Wegzoomen anzeigen" -#: src/interface.c:2678 +#: src/interface.c:2719 msgid "Display the Zoom In and Zoom Out buttons in the toolbar" msgstr "Zeigt die Heran- und Wegzoomensymbole in der Werkzeugleiste." -#: src/interface.c:2681 +#: src/interface.c:2722 msgid "Show Redo and Undo buttons" msgstr "Rückgängig und Wiederholen anzeigen" -#: src/interface.c:2685 +#: src/interface.c:2726 msgid "Display the Redo and Undo buttons in the toolbar" msgstr "Zeigt die Rückgängig- und Wiederholensymbole in der Werkzeugleiste." -#: src/interface.c:2688 +#: src/interface.c:2729 msgid "Show Search field" msgstr "Such-Feld anzeigen" -#: src/interface.c:2692 +#: src/interface.c:2733 msgid "Display the search field and button in the toolbar" msgstr "Zeige das Suchfeld in der Werkzeugleiste" -#: src/interface.c:2695 +#: src/interface.c:2736 msgid "Show Goto line field" msgstr "Zeilennummereingabefeld anzeigen" -#: src/interface.c:2699 +#: src/interface.c:2740 msgid "Display the line number field and button in the toolbar" msgstr "Zeige das Zeilennummereingabefeld in der Werkzeugleiste" -#: src/interface.c:2702 +#: src/interface.c:2743 msgid "Items" msgstr "Symbole" -#: src/interface.c:2763 +#: src/interface.c:2804 msgid "Icon style" msgstr "Symbolstil" -#: src/interface.c:2770 +#: src/interface.c:2811 msgid "Icon size" msgstr "Symbolgröße" -#: src/interface.c:2777 +#: src/interface.c:2818 msgid "Appearance" msgstr "Aussehen" -#: src/interface.c:2782 +#: src/interface.c:2823 msgid "Toolbar" msgstr "Werkzeugleiste" -#: src/interface.c:2810 -msgid "Tab Width" -msgstr "Tabulator-Breite" +#: src/interface.c:2851 +msgid "Tab Width:" +msgstr "Tabulatorbreite" -#: src/interface.c:2817 +#: src/interface.c:2858 msgid "Default encoding:" msgstr "Standardkodierung:" -#: src/interface.c:2828 +#: src/interface.c:2869 msgid "Sets the default encoding for newly created files." msgstr "Setzt die Zeichenkodierung für neu erstellte Dateien" -#: src/interface.c:2840 +#: src/interface.c:2881 msgid "The width in chars, which one tab character will take" msgstr "Die Breite in Zeichen, die ein Tabalutar-Zeichen einnimmt" -#: src/interface.c:2845 +#: src/interface.c:2886 msgid "New files" msgstr "Neue Dateien" -#: src/interface.c:2864 +#: src/interface.c:2905 msgid "Strip trailing spaces" msgstr "Leerzeichen am Zeilenende entfernen" -#: src/interface.c:2868 +#: src/interface.c:2909 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Entfernt Leerzeichen an Zeilenenden" -#: src/interface.c:2871 +#: src/interface.c:2912 msgid "Ensure new line at file end" msgstr "Neue Zeile am Dateiende" -#: src/interface.c:2875 +#: src/interface.c:2916 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:2878 -#: src/keybindings.c:161 +#: src/interface.c:2919 +#: src/keybindings.c:163 msgid "Replace tabs by space" msgstr "Tabulatoren durch Leerzeichen ersetzen" -#: src/interface.c:2885 +#: src/interface.c:2926 msgid "Saving files" msgstr "Speichern" -#: src/interface.c:2904 +#: src/interface.c:2945 msgid "Show indentation guides" msgstr "Zeige Einrückungshinweise" -#: src/interface.c:2907 +#: src/interface.c:2948 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:2910 +#: src/interface.c:2951 msgid "Show white space" msgstr "Zeige Leerzeichen" -#: src/interface.c:2913 +#: src/interface.c:2954 msgid "Marks spaces with dots and tabs with arrows." msgstr "Markiert Leerzeichen mit Punkten und Tabulatoren mit kleinen Pfeilen." -#: src/interface.c:2916 +#: src/interface.c:2957 msgid "Show line endings" msgstr "Zeilenenden anzeigen" -#: src/interface.c:2919 +#: src/interface.c:2960 msgid "Show the line ending character" msgstr "Zeilenende-Zeichen anzeigen" -#: src/interface.c:2922 +#: src/interface.c:2963 msgid "Display" msgstr "Anzeige" -#: src/interface.c:2941 +#: src/interface.c:2982 msgid "Auto indentation" msgstr "Automatische Einrückung benutzen" -#: src/interface.c:2944 +#: src/interface.c:2985 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:2946 +#: src/interface.c:2987 msgid "Line wrapping" msgstr "Zeilenumbruch" -#: src/interface.c:2951 +#: src/interface.c:2992 msgid "Construct auto completion" msgstr "Autovervollständigung von Konstrukten" -#: src/interface.c:2954 +#: src/interface.c:2995 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:2957 +#: src/interface.c:2998 msgid "XML tag auto completion" msgstr "XML-Tag Autovervollständigung" -#: src/interface.c:2960 +#: src/interface.c:3001 msgid "Automatic completion of open XML tags(includes HTML tags)" msgstr "Autovervollständigung von offenen XML-Tags, das schließt auch HTML-Tags ein." -#: src/interface.c:2963 +#: src/interface.c:3004 msgid "Enable folding" msgstr "Code-Ausblendung aktivieren" -#: src/interface.c:2966 +#: src/interface.c:3007 msgid "Whether to enable folding the code" msgstr "Soll Code-Ausblendung aktiviert werden?" -#: src/interface.c:2969 +#: src/interface.c:3010 msgid "Use indicators to show compile errors" msgstr "Benutzt Markierungen, um Probleme beim Kompilieren anzuzeigen. " -#: src/interface.c:2972 +#: src/interface.c:3013 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:2975 +#: src/interface.c:3020 +msgid "Rows of auto completion list:" +msgstr "Anzahl der Zeilen der Autovervollständigungsliste: " + +#: src/interface.c:3028 +msgid "Number of rows to display when the auto completion list is shown." +msgstr "Anzahl der Zeilen die maximal angezeigt werden sollen, wenn die Autovervollständigungsliste angezeigt wird. " + +#: src/interface.c:3031 msgid "Features" msgstr "Eigenschaften" -#: src/interface.c:2988 +#: src/interface.c:3044 msgid "" "Enter here the paths to the make tool and the compiler\n" "(tools you do not need can be let blank)" @@ -1069,50 +1091,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:2999 +#: src/interface.c:3055 msgid "Make" msgstr "Make" -#: src/interface.c:3006 -#: src/prefs.c:1050 -#: src/vte.c:167 +#: src/interface.c:3062 +#: src/prefs.c:1045 +#: src/vte.c:170 msgid "Terminal" msgstr "Terminal" -#: src/interface.c:3013 +#: src/interface.c:3069 msgid "Browser" msgstr "Browser" -#: src/interface.c:3025 +#: src/interface.c:3081 msgid "Path and options for the make tool" msgstr "Pfad und spezielle Optionen und / oder Targets für \"make\" angeben." -#: src/interface.c:3032 +#: src/interface.c:3088 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:3039 +#: src/interface.c:3095 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Pfad und evtl. Argumente zu Ihrem Lieblingsbrowser" -#: src/interface.c:3071 +#: src/interface.c:3127 msgid "Print command" msgstr "Druckbefehl" -#: src/interface.c:3083 +#: src/interface.c:3139 #, c-format msgid "Path to the command for printing files(use %f for the filename)." msgstr "Pfad zum Befehl zum Drucken(benutzen Sie %f für den Dateinamen)." -#: src/interface.c:3095 +#: src/interface.c:3151 msgid "Grep" msgstr "Grep" -#: src/interface.c:3118 +#: src/interface.c:3174 msgid "Tools" msgstr "Werkzeuge" -#: src/interface.c:3126 +#: src/interface.c:3182 msgid "" "Specify here information you want to use in templates.\n" "See documentation if you don't know, how templates work." @@ -1120,47 +1142,47 @@ "Geben Sie hier die Informationen an, die in Vorlagen benutzt werden sollen.\n" "Konsultieren Sie die Dokumentation, um mehr über Vorlagen zu erfahren." -#: src/interface.c:3142 +#: src/interface.c:3198 msgid "email address of the developer" msgstr "eMail-Adresse des Entwicklers" -#: src/interface.c:3149 +#: src/interface.c:3205 msgid "Initials of the developer name" msgstr "Initialen des Entwicklernames" -#: src/interface.c:3151 +#: src/interface.c:3207 msgid "Initial Version" msgstr "Anfangsversion" -#: src/interface.c:3163 +#: src/interface.c:3219 msgid "Version number, which a new file initially has" msgstr "Versionsnummer, die eine neue Datei zu Beginn hat" -#: src/interface.c:3170 +#: src/interface.c:3226 msgid "Company name" msgstr "Firmenname" -#: src/interface.c:3172 +#: src/interface.c:3228 msgid "Developer" msgstr "Entwickler" -#: src/interface.c:3179 +#: src/interface.c:3235 msgid "Company" msgstr "Firma" -#: src/interface.c:3186 +#: src/interface.c:3242 msgid "Mail address" msgstr "Mail-Adresse" -#: src/interface.c:3193 +#: src/interface.c:3249 msgid "Initials" msgstr "Initialen" -#: src/interface.c:3205 +#: src/interface.c:3261 msgid "The name of the developer" msgstr "Der Name des Entwicklers" -#: src/interface.c:3207 +#: src/interface.c:3263 msgid "" "Notice: For all changes you make here,\n" "you need to restart Geany to take effect." @@ -1168,105 +1190,154 @@ "Hinweis: Sie müssen Geany neustarten,\n" "wenn Sie hier Änderungen vornehmen." -#: src/interface.c:3211 +#: src/interface.c:3267 msgid "Templates" msgstr "Vorlagen" -#: src/interface.c:3219 +#: src/interface.c:3275 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:3242 +#: src/interface.c:3298 msgid "Change" msgstr "Ändern" -#: src/interface.c:3246 +#: src/interface.c:3302 msgid "Keybindings" msgstr "Tastenkürzel" -#: src/callbacks.c:213 -#: src/callbacks.c:228 +#: src/callbacks.c:191 +#: src/callbacks.c:207 msgid "Do you really want to quit?" msgstr "Möchten Sie wirklich beenden?" -#: src/callbacks.c:513 -#: src/callbacks.c:2622 +#: src/callbacks.c:510 +msgid "Any unsaved changes will be lost." +msgstr "Alle ungesicherten Änderungen gehen verloren." + +#: src/callbacks.c:511 #, c-format -msgid "" -"Are you sure you want to reload '%s'?\n" -"Any unsaved changes will be lost." -msgstr "" -"Sind Sie sicher, dass Sie '%s' neuladen möchten?\n" -"Alle ungespeicherten Änderungen gehen verloren." +msgid "Are you sure you want to reload '%s'?" +msgstr "Wollen Sie %s wirklich neu laden?" #: src/callbacks.c:914 #, 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:1373 +#: src/callbacks.c:1368 #, c-format msgid "No matches found for '%s'." msgstr "Keine Treffer für '%s' gefunden." -#: src/callbacks.c:1419 +#: src/callbacks.c:1414 #, c-format msgid "Declaration of \"%s()\" not found" msgstr "Deklaration von \"%s()\" nicht gefunden." -#: src/callbacks.c:1421 +#: src/callbacks.c:1416 #, c-format msgid "Definition of \"%s()\" not found" msgstr "Definition von \"%s()\" nicht gefunden." -#: src/callbacks.c:1732 +#: src/callbacks.c:1675 +msgid "Enter custom options for the make tool" +msgstr "Spezielle Optionen / Targets für \"make\" angeben." + +#: src/callbacks.c:1676 +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:1731 msgid "Failed to execute the view program" msgstr "Konnte das Anzeigeprogramm nicht ausführen" -#: src/callbacks.c:1743 +#: src/callbacks.c:1742 msgid "Failed to execute the terminal program" msgstr "Konnte das Terminal-Programm nicht ausführen" -#: src/callbacks.c:2059 -msgid "Invalid directory for find in files." -msgstr "Ungültiges Verzeichnis." - -#: src/callbacks.c:2084 -msgid "No text to find." -msgstr "Kein Text zum Suchen angegeben." - #. initialize the dialog -#: src/callbacks.c:2204 -#: src/dialogs.c:70 +#: src/callbacks.c:1966 +#: src/dialogs.c:67 msgid "Open File" msgstr "Datei öffnen" -#: src/callbacks.c:2253 -#: src/callbacks.c:2298 -#: src/callbacks.c:2338 -#: src/callbacks.c:2396 +#: src/callbacks.c:2015 +#: src/callbacks.c:2060 +#: src/callbacks.c:2100 +#: src/callbacks.c:2158 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:2228 +#: src/utils.c:1682 +msgid "dd.mm.yyyy" +msgstr "TT.MM.JJ" + +#: src/callbacks.c:2230 +#: src/utils.c:1683 +msgid "mm.dd.yyyy" +msgstr "MM.TT.JJ" + +#: src/callbacks.c:2232 +#: src/utils.c:1684 +msgid "yyyy/mm/dd" +msgstr "JJJJ/MM/TT" + +#: src/callbacks.c:2234 +#: src/utils.c:1693 +msgid "dd.mm.yyyy hh:mm:ss" +msgstr "TT.MM.JJJJ Stunden:Minuten:Sekunden" + +#: src/callbacks.c:2236 +#: src/utils.c:1694 +msgid "mm.dd.yyyy hh:mm:ss" +msgstr "MM.TT.JJJJ Stunden:Minuten:Sekunden" + +#: src/callbacks.c:2238 +#: src/utils.c:1695 +msgid "yyyy/mm/dd hh:mm:ss" +msgstr "JJJJ/MM/TT Stunden:Minuten:Sekunden" + +#: src/callbacks.c:2240 +#: src/utils.c:1704 +#: src/utils.c:1708 +#: src/utils.c:1712 +#: src/utils.c:1716 +msgid "Use custom date format" +msgstr "Benutze selbst erstelltes Zeitformat" + +#: src/callbacks.c:2247 +msgid "Custom date format" +msgstr "Benutzerdefiniertes Datumsformat" + +#: src/callbacks.c:2248 +msgid "Enter here a custom date and time format which should be inserted. You can use all conversion specifiers which can be used with the ANSI C strftime function. See \"man strftime\" for more information." +msgstr "" + +#: src/callbacks.c:2267 +msgid "Date format string could not be converted (possibly too long)." +msgstr "" + #: src/support.c:90 #: src/support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Konnte PixMap %s nicht finden." -#: src/dialogs.c:75 +#: src/dialogs.c:72 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:111 +#: src/dialogs.c:108 msgid "Detect by file extension " msgstr "Durch Dateiendung erkennen" -#: src/dialogs.c:166 +#: src/dialogs.c:162 msgid "Save File" msgstr "Datei speichern" -#: src/dialogs.c:277 +#: src/dialogs.c:272 #, c-format msgid "" "The file '%s' is not saved.\n" @@ -1275,7 +1346,7 @@ "%s ist nicht gespeichert.\n" "Möchten Sie die Datei vor dem Beenden speichern?" -#: src/dialogs.c:282 +#: src/dialogs.c:277 msgid "" "The file is not saved.\n" "Do you want to save it before closing?" @@ -1283,27 +1354,27 @@ "Die Datei ist nicht gespeichert.\n" "Möchten Sie die Datei vor dem Beenden speichern?" -#: src/dialogs.c:293 -msgid "Don't save" +#: src/dialogs.c:288 +msgid "_Don't save" msgstr "Nicht speichern" -#: src/dialogs.c:345 +#: src/dialogs.c:340 msgid "Choose font" msgstr "Schriftart auswählen" -#: src/dialogs.c:384 +#: src/dialogs.c:379 msgid "Word Count" msgstr "Wörter zählen" -#: src/dialogs.c:393 +#: src/dialogs.c:388 msgid "selection" msgstr "Auswahl" -#: src/dialogs.c:401 +#: src/dialogs.c:396 msgid "whole document" msgstr "Ganzes Dokument" -#: src/dialogs.c:403 +#: src/dialogs.c:398 #, c-format msgid "" "Range:\t\t%s\n" @@ -1319,256 +1390,151 @@ "Zeichen:\t\t%d\n" #. compile the code -#: src/dialogs.c:476 +#: src/dialogs.c:471 msgid "_Compile" msgstr "_Kompilieren" -#: src/dialogs.c:479 +#: src/dialogs.c:474 msgid "Compiles the current file" msgstr "Kompiliert die aktuelle Datei" -#: src/dialogs.c:494 +#: 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:508 +#: src/dialogs.c:503 msgid "_Make all" msgstr "_Make all" -#: src/dialogs.c:511 -#: src/dialogs.c:613 +#: 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:517 +#: src/dialogs.c:512 msgid "Make custom _target" msgstr "Make eigenes _Target" -#: src/dialogs.c:521 -#: src/dialogs.c:627 +#: 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:526 +#: src/dialogs.c:521 msgid "Make _object" msgstr "Make _Objekt-Datei" -#: src/dialogs.c:530 +#: 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:558 +#: src/dialogs.c:553 msgid "_Set Includes and Arguments" msgstr "Programm-Parameter angeben" -#: src/dialogs.c:563 +#: 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:584 +#: src/dialogs.c:579 msgid "LaTeX -> DVI" msgstr "LaTeX -> DVI" -#: src/dialogs.c:587 +#: 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:597 +#: src/dialogs.c:592 msgid "LaTeX -> PDF" msgstr "LaTeX -> PDF" -#: src/dialogs.c:600 +#: 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:610 +#: src/dialogs.c:605 msgid "Build with \"make\"" msgstr "Mit \"make\" erstellen" #. build the code with make -#: src/dialogs.c:621 +#: src/dialogs.c:616 msgid "Build with make (custom target)" msgstr "Mit \"make\" erstellen (eigenes Target angeben)" #. DVI view -#: src/dialogs.c:632 +#: src/dialogs.c:627 msgid "View DVI file" msgstr "DVI-Datei anzeigen" -#: src/dialogs.c:638 -#: src/dialogs.c:651 +#: 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:645 +#: src/dialogs.c:640 msgid "View PDF file" msgstr "PDF-Datei anzeigen" #. arguments -#: src/dialogs.c:664 -#: src/dialogs.c:1125 +#: src/dialogs.c:659 +#: src/dialogs.c:766 msgid "Set Arguments" msgstr "Programm-Parameter angeben" -#: src/dialogs.c:671 +#: src/dialogs.c:666 msgid "Sets the program paths and arguments" msgstr "Programm-Parameter angeben" -#: src/dialogs.c:713 -msgid "Enter custom options for the make tool" -msgstr "Spezielle Optionen / Targets für \"make\" angeben." - -#: src/dialogs.c:718 -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/dialogs.c:748 +#: 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:770 -#: src/dialogs.c:1053 -msgid "_Case sensitive" -msgstr "Groß- / Kleinschreibung beachten" - -#: src/dialogs.c:775 -msgid "Match only a _whole word" -msgstr "Nur ganze Wörter finden" - -#: src/dialogs.c:780 -msgid "Match only word s_tart" -msgstr "Nur Wort_anfänge finden" - -#: src/dialogs.c:790 -msgid "_Use regular expressions" -msgstr "Reguläre Ausdrücke benutzen" - -#: src/dialogs.c:794 -msgid "Use POSIX-like regular expressions. For detailed information about using regular expressions, please read the documentation." -msgstr "Benutze POSIX-ähnliche reguläre Ausdrücke. Für weitere Informationen über reguläre Ausdrücke lesen Sie bitte die Dokumentation." - -#: src/dialogs.c:797 -msgid "_Search backwards" -msgstr "Rückwärts suchen" - -#: src/dialogs.c:802 -msgid "_Replace control characters" -msgstr "Kontrollzeichen ersetzen" - -#: src/dialogs.c:807 +#: src/dialogs.c:771 msgid "" -"Replace \\\\, \\t, \\n" -", \\r and \\uXXXX (Unicode chararacters) with the corresponding control characters." -msgstr "" -"Ersetzt \\\\, \\t, \\n" -", \\r und \\uXXXX (Unicode-Zeichen) mit den entsprechenden Kontrollzeichen." - -#: src/dialogs.c:839 -msgid "Find" -msgstr "Suchen" - -#: src/dialogs.c:844 -#: src/dialogs.c:931 -#: src/dialogs.c:1044 -msgid "Enter the search text here:" -msgstr "Geben Sie hier den Suchbegriff ein:" - -#: src/dialogs.c:909 -#: src/keybindings.c:143 -msgid "Replace" -msgstr "Ersetzen" - -#: src/dialogs.c:912 -msgid "_In Selection" -msgstr "_Auswahl ersetzen" - -#: src/dialogs.c:914 -msgid "Replace all matches found in the currently selected text" -msgstr "Ersetze alle Treffer im aktuell markierten Text" - -#: src/dialogs.c:918 -msgid "Replace _All" -msgstr "_Alle ersetzen" - -#: src/dialogs.c:934 -msgid "Enter the replace text here:" -msgstr "Geben Sie hier den Ersetzungstext ein:" - -#: src/dialogs.c:980 -msgid "Replace in all _open files" -msgstr "In allen _geöffneten Dateien ersetzen" - -#: src/dialogs.c:984 -msgid "Replaces the search text in all opened files. This option is only useful(and used) if you click on \"Replace All\"." -msgstr "Ersetzt den Suchtext in allen geöffneten Dateien. Diese Option ist nur sinnvoll(und benutzt) wenn Sie \"Alle ersetzen\" wählen." - -#: src/dialogs.c:1024 -#: src/keybindings.c:145 -msgid "Find in files" -msgstr "In Dateien suchen" - -#: src/dialogs.c:1058 -msgid "Invert search results" -msgstr "Suchmuster umkehren" - -#: src/dialogs.c:1063 -msgid "Invert the sense of matching, to select non-matching lines." -msgstr "Kehrt die Treffer um, so wird alles gefunden, was nicht auf das Suchmuster passt." - -#: src/dialogs.c:1065 -msgid "_Use extended regular expressions" -msgstr "_Reguläre Ausdrücke benutzen" - -#: src/dialogs.c:1070 -msgid "See grep's manual page for more information." -msgstr "Schauen Sie in die Handbuchseite von grep für mehr Informationen." - -#: src/dialogs.c:1130 -msgid "" "Set programs and options for compilation and viewing (La)TeX files.\n" "The filename is appended automatically at the end.\n" msgstr "" "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:1138 +#: src/dialogs.c:779 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:1159 +#: src/dialogs.c:800 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:1180 +#: src/dialogs.c:821 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:1201 +#: src/dialogs.c:842 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:1232 +#: src/dialogs.c:873 msgid "Set Includes and Arguments" msgstr "Programm-Parameter angeben" -#: src/dialogs.c:1237 +#: src/dialogs.c:878 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:1246 +#: src/dialogs.c:887 msgid "Enter here arguments to your compiler." msgstr "Geben Sie hier Paramter für den Compiler an." -#: src/dialogs.c:1252 -#: src/dialogs.c:1275 -#: src/dialogs.c:1299 +#: src/dialogs.c:893 +#: src/dialogs.c:916 +#: src/dialogs.c:940 #, c-format msgid "" "%f will be replaced by the complete filename\n" @@ -1583,24 +1549,24 @@ "%f -> test_datei.c\n" "%e -> test_datei" -#: src/dialogs.c:1269 +#: src/dialogs.c:910 msgid "Enter here arguments to your linker." msgstr "Geben Sie hier Parameter für den Linker an." #. program-args -#: src/dialogs.c:1293 +#: src/dialogs.c:934 msgid "Enter here arguments to your program." msgstr "Geben Sie hier Parameter für Ihr Programm an." -#: src/dialogs.c:1338 +#: src/dialogs.c:978 msgid "Show _hidden files" msgstr "_Versteckte Dateien anzeigen" -#: src/dialogs.c:1355 +#: src/dialogs.c:994 msgid "Set filetype:" msgstr "Dateityp festlegen:" -#: src/dialogs.c:1358 +#: 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." @@ -1608,159 +1574,157 @@ "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:1414 +#: src/dialogs.c:1057 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:1434 -#: src/dialogs.c:1435 -#: src/dialogs.c:1436 -#: src/dialogs.c:1442 -#: src/dialogs.c:1443 -#: src/dialogs.c:1444 -#: src/utils.c:144 -#: src/utils.c:146 -#: src/utils.c:1078 +#: src/dialogs.c:1076 +#: src/dialogs.c:1077 +#: src/dialogs.c:1078 +#: src/dialogs.c:1084 +#: src/dialogs.c:1085 +#: src/dialogs.c:1086 +#: src/utils.c:150 +#: src/utils.c:152 +#: src/utils.c:1066 msgid "unknown" msgstr "unbekannt" -#: src/dialogs.c:1448 +#: src/dialogs.c:1090 msgid "Properties" msgstr "Eigenschaften" -#: src/dialogs.c:1476 +#: src/dialogs.c:1118 msgid "Type:" msgstr "Dateityp:" -#: src/dialogs.c:1489 +#: src/dialogs.c:1131 msgid "Size:" msgstr "Größe:" -#: src/dialogs.c:1504 +#: src/dialogs.c:1146 msgid "Location:" msgstr "Ort:" -#: src/dialogs.c:1517 +#: src/dialogs.c:1159 msgid "Read-only:" msgstr "Schreibgeschützt:" -#: src/dialogs.c:1524 +#: src/dialogs.c:1166 msgid "(only inside Geany)" msgstr "(nur innerhalb von Geany)" -#: src/dialogs.c:1533 +#: src/dialogs.c:1175 msgid "Encoding:" msgstr "Kodierung:" -#: src/dialogs.c:1542 -#: src/utils.c:145 +#: src/dialogs.c:1184 +#: src/utils.c:151 msgid "(with BOM)" msgstr "(mit BOM)" -#: src/dialogs.c:1542 -#: src/utils.c:145 +#: src/dialogs.c:1184 +#: src/utils.c:151 msgid "(without BOM)" msgstr "(ohne BOM)" -#: src/dialogs.c:1552 +#: src/dialogs.c:1194 msgid "Modified:" msgstr "Modifiziert:" -#: src/dialogs.c:1565 +#: src/dialogs.c:1207 msgid "Changed:" msgstr "Geändert:" -#: src/dialogs.c:1578 +#: src/dialogs.c:1220 msgid "Accessed:" msgstr "Zugriff:" #. Header -#: src/dialogs.c:1607 +#: src/dialogs.c:1249 msgid "Read:" msgstr "Lesen" -#: src/dialogs.c:1614 +#: src/dialogs.c:1256 msgid "Write:" msgstr "Schreiben:" -#: src/dialogs.c:1621 +#: src/dialogs.c:1263 msgid "Execute:" msgstr "Ausführen:" #. Owner -#: src/dialogs.c:1629 +#: src/dialogs.c:1271 msgid "Owner:" msgstr "Eigentümer:" #. Group -#: src/dialogs.c:1665 +#: src/dialogs.c:1307 msgid "Group:" msgstr "Gruppe:" #. Other -#: src/dialogs.c:1701 +#: src/dialogs.c:1343 msgid "Other:" msgstr "Andere:" -#: src/dialogs.c:1783 +#: src/dialogs.c:1464 msgid "Keyboard shortcuts" msgstr "Tastaturkürzel" -#: src/dialogs.c:1790 +#: src/dialogs.c:1471 msgid "The following keyboard shortcuts are defined:" msgstr "Folgende Tastenkürzel sind definiert: " -#: src/document.c:327 +#: src/document.c:324 #, c-format msgid "File %s closed." msgstr "Datei %s wurde geschlossen." -#: src/document.c:395 +#: src/document.c:392 msgid "New file opened." msgstr "Neue Datei geöffnet." -#: src/document.c:440 -#: src/document.c:449 -#: src/document.c:450 +#: src/document.c:437 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: src/document.c:472 +#: src/document.c:461 #, 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:488 +#: src/document.c:506 #, 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:563 #, 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:658 +#: src/document.c:638 #, c-format msgid "File %s reloaded." msgstr "Datei %s neu geladen." -#: src/document.c:660 +#: src/document.c:640 #, c-format msgid "File %s opened(%d%s)." msgstr "Datei %s geöffnet(%d%s)." -#: src/document.c:662 +#: src/document.c:642 msgid ", read-only" msgstr ", schreibgeschützt" -#: src/document.c:699 -#: src/document.c:778 +#: src/document.c:681 +#: src/document.c:761 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." -#: src/document.c:743 +#: src/document.c:725 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved.\n" @@ -1769,34 +1733,34 @@ "Beim Konvertieren der Datei von UTF-8 in \"%s\" ist ein Fehler aufgetreten. Die Datei bleibt ungespeichert.\n" "Fehlermeldung: %s\n" -#: src/document.c:766 +#: src/document.c:749 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." -#: src/document.c:800 +#: src/document.c:783 #, c-format msgid "File %s saved." msgstr "Datei %s wurde gespeichert." -#: src/document.c:808 +#: src/document.c:791 #, c-format -msgid "The match \"%s\" was not found. Wrap search around the document?" +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:1141 +#: src/document.c:1124 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: src/document.c:1142 +#: src/document.c:1125 msgid "Mac (CR)" msgstr "Mac (CR)" -#: src/document.c:1144 +#: src/document.c:1127 msgid "Unix (LF)" msgstr "Unix (LF)" -#: src/document.c:1295 +#: src/document.c:1278 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -1807,166 +1771,175 @@ "\n" "%s" -#: src/document.c:1304 +#: src/document.c:1287 #, c-format msgid "Printing of \"%s\" failed(return code: %d)." msgstr "Drucken der Datei \"%s\" ist fehlgeschlagen(Rückgabewert: %d)." -#: src/document.c:1309 +#: src/document.c:1292 #, c-format msgid "File %s printed." msgstr "Datei %s wurde gedruckt." -#: src/utils.c:136 +#: src/utils.c:142 #, 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:140 +#: src/utils.c:146 msgid "OVR" msgstr "ÜBER" -#: src/utils.c:140 +#: src/utils.c:146 msgid "INS" msgstr "EINF" -#: src/utils.c:414 +#: src/utils.c:401 #, c-format msgid "Font updated (%s)." msgstr "Schriftart gewechselt (%s)." -#: src/utils.c:428 -#: src/geany.h:60 +#: src/utils.c:415 +#: src/geany.h:50 msgid "untitled" msgstr "unbenannt" -#: src/utils.c:429 +#: src/utils.c:416 msgid "(Unsaved)" msgstr "(Ungespeichert)" -#: src/utils.c:698 +#: src/utils.c:685 msgid "No tags found" msgstr "Keine Symbole gefunden." -#: src/utils.c:979 +#: src/utils.c:966 +msgid "Do you want to reload it?" +msgstr "Möchte Sie es neu laden? " + +#: src/utils.c:967 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" -"the current buffer.\n" -"Do you want to reload it?" -msgstr "" -"Die Datei '%s' hat sich geändert.\n" -"Möchten Sie sie neu laden?" +"the current buffer." +msgstr "Die Datei '%s' auf den Datenträger ist aktueller als die momentan geöffnete Version " -#: src/utils.c:1727 +#: src/utils.c:1652 msgid "C Standard Library" msgstr "C Standard Bibliothek" -#: src/utils.c:1728 +#: src/utils.c:1653 msgid "ISO C99" msgstr "ISO C99" -#: src/utils.c:1729 +#: src/utils.c:1654 msgid "C++ (C Standard Library)" msgstr "C++ (C Standard Bibliothek)" -#: src/utils.c:1730 +#: src/utils.c:1655 msgid "C++ Standard Library" msgstr "C++ Standard Bibliothek" -#: src/utils.c:1731 +#: src/utils.c:1656 msgid "C++ STL" msgstr "C++ STL" -#: src/filetypes.c:54 +#: src/utils.c:1720 +msgid "Set custom date format" +msgstr "Benutzerdefiniertes Datumsformat einstellen " + +#: src/filetypes.c:122 msgid "C source file" msgstr "C Quelldatei" -#: src/filetypes.c:73 +#: src/filetypes.c:143 msgid "C++ source file" msgstr "C++ Quelldatei" -#: src/filetypes.c:100 +#: src/filetypes.c:172 msgid "D source file" msgstr "D Quelldatei" -#: src/filetypes.c:119 +#: src/filetypes.c:193 msgid "Java source file" msgstr "Java Quelldatei" -#: src/filetypes.c:137 +#: src/filetypes.c:213 msgid "Pascal source file" msgstr "Pascal Quelldatei" -#: src/filetypes.c:159 +#: src/filetypes.c:237 msgid "Assembler source file" msgstr "Assembler Quelldatei" -#: src/filetypes.c:176 +#: src/filetypes.c:256 +msgid "Fortran source file (F77)" +msgstr "Fortran (F77) Quelldatei" + +#: src/filetypes.c:280 msgid "(O)Caml source file" msgstr "(O)Caml Quelldatei" -#: src/filetypes.c:194 +#: src/filetypes.c:300 msgid "Perl source file" msgstr "Perl Quelldatei" -#: src/filetypes.c:213 +#: src/filetypes.c:321 msgid "PHP / HTML source file" msgstr "PHP / HTML Quelldatei" -#: src/filetypes.c:236 +#: src/filetypes.c:346 msgid "Python source file" msgstr "Python Quelldatei" -#: src/filetypes.c:254 +#: src/filetypes.c:366 msgid "Ruby source file" msgstr "Ruby Quelldatei" -#: src/filetypes.c:273 +#: src/filetypes.c:387 msgid "Tcl source file" msgstr "Tcl Quelldatei" -#: src/filetypes.c:292 +#: src/filetypes.c:408 msgid "Shell script file" msgstr "Shellscript Datei" -#: src/filetypes.c:315 +#: src/filetypes.c:433 msgid "Makefile" msgstr "Makefile" -#: src/filetypes.c:333 +#: src/filetypes.c:453 msgid "XML source file" msgstr "XML Quelldatei" -#: src/filetypes.c:351 +#: src/filetypes.c:473 msgid "Docbook source file" msgstr "Docbook Quelldatei" -#: src/filetypes.c:368 +#: src/filetypes.c:492 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: src/filetypes.c:385 +#: src/filetypes.c:511 msgid "SQL Dump file" msgstr "SQL-Dump Datei" -#: src/filetypes.c:402 +#: src/filetypes.c:530 msgid "LaTeX source file" msgstr "LaTeX Quelldatei" -#: src/filetypes.c:421 +#: src/filetypes.c:551 msgid "O-Matrix source file" msgstr "O-Matrix Quelldatei" -#: src/filetypes.c:438 +#: src/filetypes.c:570 msgid "Config file" msgstr "Konfigurationsdatei" -#: src/filetypes.c:459 +#: src/filetypes.c:593 msgid "All files" msgstr "Alle Dateien" -#: src/filetypes.c:468 +#: src/filetypes.c:602 msgid "None" msgstr "Keiner" @@ -1987,20 +1960,20 @@ msgid "Information" msgstr "Information" -#: src/keyfile.c:62 +#: src/keyfile.c:64 #, c-format msgid "%s configuration file, edit as you need" msgstr "%s Konfigurationsdatei. Bei Bedarf anpassen." -#: src/keyfile.c:111 +#: src/keyfile.c:114 msgid " VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on keystroke;scroll on output;follow path of file" msgstr "VTE Einstellungen: Schriftart;Vordergrundfarbe;Hintergrundfarbe;Zurückscrollen;Typ;Scrollen bei Tastendruck;Scrollen bei Ausgabe;Dateipfad setzen" -#: src/keyfile.c:272 +#: src/keyfile.c:281 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:57 +#: src/msgwindow.c:89 msgid "Status messages" msgstr "Meldungen" @@ -2009,134 +1982,134 @@ 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:117 -#: src/build.c:294 -#: src/build.c:436 -#: src/search.c:107 +#: src/build.c:116 +#: src/build.c:298 +#: src/build.c:437 +#: src/search.c:811 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" -#: src/build.c:287 +#: src/build.c:284 #, c-format msgid "%s (in directory: %s)" msgstr "%s (im Verzeichnis: %s)" -#: src/build.c:369 +#: src/build.c:371 #, 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:384 +#: src/build.c:386 #, 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:399 +#: src/build.c:400 #, c-format msgid "Failed to change the working directory to %s" msgstr "Konnte Arbeitsverzeichnis(%s) nicht wechseln" -#: src/build.c:417 +#: src/build.c:418 #, 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:528 +#: src/build.c:529 msgid "compilation finished unsuccessful" msgstr "Kompilierung beendet - nicht erfolgreich." -#: src/build.c:532 +#: src/build.c:533 msgid "compilation finished successful" msgstr "Kompilierung beendet - erfolgreich." -#: src/prefs.c:295 +#: src/prefs.c:291 msgid "Action" msgstr "Aktion" -#: src/prefs.c:300 +#: src/prefs.c:296 msgid "Shortcut" msgstr "Tastenkürzel" -#: src/prefs.c:762 +#: src/prefs.c:757 msgid "Grab key" msgstr "Tasten festlegen" -#: src/prefs.c:766 +#: src/prefs.c:761 #, 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:890 +#: src/prefs.c:885 #, 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:948 +#: src/prefs.c:943 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:964 +#: src/prefs.c:959 msgid "Terminal font" msgstr "Terminal Schriftart" -#: src/prefs.c:974 +#: src/prefs.c:969 msgid "Sets the font for the terminal widget." msgstr "Ändert die Schriftart für das Terminal" -#: src/prefs.c:976 +#: src/prefs.c:971 msgid "Foreground color" msgstr "Vordergrundfarbe" -#: src/prefs.c:982 +#: src/prefs.c:977 msgid "Background color" msgstr "Hintergrundfarbe" -#: src/prefs.c:992 +#: src/prefs.c:987 msgid "Sets the foreground color of the text in the terminal widget." msgstr "Setzt die Vordergrundfarbe für Text im Terminal." -#: src/prefs.c:999 +#: src/prefs.c:994 msgid "Sets the background color of the text in the terminal widget." msgstr "Setzt die Hintergrundfarbe für Text im Terminal." -#: src/prefs.c:1002 +#: src/prefs.c:997 msgid "Scrollback lines" msgstr "Zeilen zum Zurückrollen" -#: src/prefs.c:1013 +#: src/prefs.c:1008 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:1017 +#: src/prefs.c:1012 msgid "Terminal emulation" msgstr "Terminalemulation" -#: src/prefs.c:1027 +#: src/prefs.c:1022 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:1029 +#: src/prefs.c:1024 msgid "Scroll on keystroke" msgstr "Bei Tastendruck scrollen" -#: src/prefs.c:1033 +#: src/prefs.c:1028 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:1036 +#: src/prefs.c:1031 msgid "Scroll on output" msgstr "Bei Ausgabe scrollen" -#: src/prefs.c:1040 +#: src/prefs.c:1035 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:1043 +#: src/prefs.c:1038 msgid "Follow the path of the current file" msgstr "Pfad der aktuellen Datei setzen" -#: src/prefs.c:1047 +#: src/prefs.c:1042 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." @@ -2323,27 +2296,27 @@ msgid "Korean" msgstr "Koreanisch" -#: src/encodings.c:187 +#: src/encodings.c:209 msgid "_West European" msgstr "_Westeuropäisch" -#: src/encodings.c:193 +#: src/encodings.c:215 msgid "_East European" msgstr "_Osteuropäisch" -#: src/encodings.c:199 +#: src/encodings.c:221 msgid "East _Asian" msgstr "Ost_asiatisch" -#: src/encodings.c:205 +#: src/encodings.c:227 msgid "_SE & SW Asian" msgstr "_SO- & SW-Asiatisch" -#: src/encodings.c:211 +#: src/encodings.c:233 msgid "_Middle Eastern" msgstr "_Nahöstlich" -#: src/encodings.c:217 +#: src/encodings.c:239 msgid "_Unicode" msgstr "_Unicode" @@ -2482,6 +2455,10 @@ msgid "Reload" msgstr "Neu laden" +#: src/vte.c:400 +msgid "_Input Methods" +msgstr "_Eingabemethoden" + #: src/keybindings.c:115 msgid "New" msgstr "Neu" @@ -2522,184 +2499,276 @@ msgid "Select All" msgstr "Alles ersetzen" -#: src/keybindings.c:139 +#: src/keybindings.c:137 +msgid "Insert date" +msgstr "Datum einfügen" + +#: src/keybindings.c:141 msgid "Find Next" msgstr "Weitersuchen" -#: src/keybindings.c:141 +#: src/keybindings.c:143 msgid "Find Previous" msgstr "Vorheriges" -#: src/keybindings.c:149 +#: src/keybindings.c:145 +#: src/search.c:260 +msgid "Replace" +msgstr "Ersetzen" + +#: src/keybindings.c:147 +#: src/search.c:375 +msgid "Find in files" +msgstr "In Dateien suchen" + +#: src/keybindings.c:151 msgid "Show Colour Chooser" msgstr "Farbwähler öffnen" -#: src/keybindings.c:151 +#: src/keybindings.c:153 msgid "Fullscreen" msgstr "Vollbild" -#: src/keybindings.c:153 +#: src/keybindings.c:155 msgid "Toggle Messages Window" msgstr "Meldungsfenster verstecken" -#: src/keybindings.c:155 +#: src/keybindings.c:157 msgid "Toggle Sidebar" msgstr "Seitenleiste ausblenden" -#: src/keybindings.c:157 +#: src/keybindings.c:159 msgid "Zoom In" msgstr "Hineinzoomen" -#: src/keybindings.c:159 +#: src/keybindings.c:161 msgid "Zoom Out" msgstr "Herauszoomen" -#: src/keybindings.c:163 +#: src/keybindings.c:165 msgid "Fold all" msgstr "Alle einklappen" -#: src/keybindings.c:165 +#: src/keybindings.c:167 msgid "Unfold all" msgstr "Alle ausklappen" -#: src/keybindings.c:169 +#: src/keybindings.c:171 msgid "Build" msgstr "Erstellen" -#: src/keybindings.c:171 +#: src/keybindings.c:173 msgid "Make all" msgstr "Make all" -#: src/keybindings.c:174 +#: src/keybindings.c:176 msgid "Make custom target" msgstr "Make mit eigenem Target" -#: src/keybindings.c:176 +#: src/keybindings.c:178 msgid "Make object" msgstr "Make Objekt-Datei" -#: src/keybindings.c:178 +#: src/keybindings.c:180 msgid "Run" msgstr "Ausführen" -#: src/keybindings.c:180 +#: src/keybindings.c:182 msgid "Run (alternative command)" msgstr "Ausführen (alternativer Befehl)" -#: src/keybindings.c:182 +#: src/keybindings.c:184 msgid "Build options" msgstr "Optionen bei der Erzeugung" -#: src/keybindings.c:184 +#: src/keybindings.c:186 msgid "Reload symbol list" msgstr "Symbol-Ansicht neuladen" -#: src/keybindings.c:186 +#: src/keybindings.c:188 msgid "Switch to Editor" msgstr "Zum Editor wechseln" -#: src/keybindings.c:188 +#: src/keybindings.c:190 msgid "Switch to Scribble" msgstr "Zu den Notizen wechseln " -#: src/keybindings.c:190 +#: src/keybindings.c:192 msgid "Switch to VTE" msgstr "Wechsel zur VTE" -#: src/keybindings.c:192 +#: src/keybindings.c:194 msgid "Switch to left document" msgstr "Zum linken Dokument wechseln" -#: src/keybindings.c:194 +#: src/keybindings.c:196 msgid "Switch to right document" msgstr "Zum rechten Dokument wechseln" -#: src/keybindings.c:196 +#: src/keybindings.c:198 msgid "Duplicate line or selection" msgstr "Zeile oder Auswahl kopieren" -#: src/keybindings.c:198 +#: src/keybindings.c:200 msgid "Comment line" msgstr "Zeile auskommentieren" -#: src/keybindings.c:200 +#: src/keybindings.c:202 msgid "Uncomment line" msgstr "Zeile einkommentieren" -#: src/keybindings.c:202 +#: src/keybindings.c:204 msgid "Increase indent" msgstr "Einzug erhöhen" -#: src/keybindings.c:204 +#: src/keybindings.c:206 msgid "Decrease indent" msgstr "Einzug verringern" -#: src/keybindings.c:206 +#: src/keybindings.c:208 msgid "Complete word" msgstr "Vervollständige Wort" -#: src/keybindings.c:210 -#: src/keybindings.c:213 +#: src/keybindings.c:212 +#: src/keybindings.c:215 msgid "Show calltip" msgstr "Calltip anzeigen" -#: src/keybindings.c:216 +#: src/keybindings.c:218 msgid "Show macro list" msgstr "Zeige Makroliste" -#: src/keybindings.c:218 +#: src/keybindings.c:220 msgid "Suppress auto completion" msgstr "Autovervollständigung abstellen" -#: src/keybindings.c:220 +#: src/keybindings.c:222 msgid "Find Usage" msgstr "Auftreten finden" -#: src/search.c:67 +#: src/search.c:120 +msgid "_Use regular expressions" +msgstr "Reguläre Ausdrücke benutzen" + +#: src/search.c:124 +msgid "Use POSIX-like regular expressions. For detailed information about using regular expressions, please read the documentation." +msgstr "Benutze POSIX-ähnliche reguläre Ausdrücke. Für weitere Informationen über reguläre Ausdrücke lesen Sie bitte die Dokumentation." + +#: src/search.c:129 +msgid "_Search backwards" +msgstr "Rückwärts suchen" + +#: src/search.c:134 +msgid "Use _escape sequences" +msgstr "Sonderzeichen _maskieren" + +#: src/search.c:139 +msgid "" +"Replace \\\\, \\t, \\n" +", \\r and \\uXXXX (Unicode chararacters) with the corresponding control characters." +msgstr "" +"Ersetzt \\\\, \\t, \\n" +", \\r und \\uXXXX (Unicode-Zeichen) mit den entsprechenden Sonderzeichen." + +#. auto destroy the size group +#: src/search.c:148 +#: src/search.c:420 +msgid "_Case sensitive" +msgstr "Groß- / Kleinschreibung beachten" + +#: src/search.c:153 +msgid "Match only a _whole word" +msgstr "Nur ganze Wörter finden" + +#: src/search.c:158 +msgid "Match only word s_tart" +msgstr "Nur Wort_anfänge finden" + +#: src/search.c:193 +msgid "Find" +msgstr "Suchen" + +#: src/search.c:198 +#: src/search.c:283 +#: src/search.c:402 +msgid "Search for:" +msgstr "Suchen nach:" + +#: src/search.c:264 +msgid "_In Selection" +msgstr "_Auswahl ersetzen" + +#: src/search.c:266 +msgid "Replace all matches found in the currently selected text" +msgstr "Ersetze alle Treffer im aktuell markierten Text" + +#: src/search.c:270 +msgid "Replace _All" +msgstr "_Alle ersetzen" + +#: src/search.c:286 +msgid "Replace with:" +msgstr "Ersetzen durch:" + +#: src/search.c:328 +msgid "Replace in all _open files" +msgstr "In allen _geöffneten Dateien ersetzen" + +#: src/search.c:332 +msgid "Replaces the search text in all opened files. This option is only useful(and used) if you click on \"Replace All\"." +msgstr "Ersetzt den Suchtext in allen geöffneten Dateien. Diese Option ist nur sinnvoll(und benutzt) wenn Sie \"Alle ersetzen\" wählen." + +#: src/search.c:382 +msgid "Directory:" +msgstr "Ordner:" + +#: src/search.c:425 +msgid "_Invert search results" +msgstr "Suchmuster umkehren" + +#: src/search.c:430 +msgid "Invert the sense of matching, to select non-matching lines." +msgstr "Kehrt die Treffer um, so wird alles gefunden, was nicht auf das Suchmuster passt." + +#: src/search.c:432 +msgid "_Use extended regular expressions" +msgstr "_Reguläre Ausdrücke benutzen" + +#: src/search.c:437 +msgid "See grep's manual page for more information." +msgstr "Schauen Sie in die Handbuchseite von grep für mehr Informationen." + +#: src/search.c:486 +msgid "Select folder" +msgstr "Ordner wählen" + +#: src/search.c:721 +msgid "Invalid directory for find in files." +msgstr "Ungültiges Verzeichnis." + +#: src/search.c:745 +msgid "No text to find." +msgstr "Kein Text zum Suchen angegeben." + +#: src/search.c:771 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "Konnte das grep Kommando '%s' nicht finden (Pfad zum Grep Kommando in den Einstellungen überprüfen)." -#: src/search.c:172 +#: src/search.c:876 #, c-format msgid "Could not open directory (%s)" msgstr "Konnte Verzeichnis nicht öffnen (%s)." -#: src/search.c:220 +#: src/search.c:924 msgid "Search failed." msgstr "Suche schlug fehl." -#: src/search.c:226 +#: src/search.c:930 msgid "Search completed." msgstr "Suche abgeschlossen." -#: src/search.c:227 +#: src/search.c:931 msgid "No matches found." msgstr "Keine Treffer gefunden." -#~ msgid "Change _Selection" -#~ msgstr "Auswahl _verändern" -#~ msgid "To lower-case" -#~ msgstr "In Kleinbuchstaben" -#~ msgid "To upper-case" -#~ msgstr "In Großbuchstaben" -#~ msgid "Break the line at the window border and continue it on the next line" -#~ msgstr "" -#~ "Zeilen am Fensterrand umbrechen und auf der nächsten Zeile fortsetzen." -#~ msgid "Change Selection" -#~ msgstr "Auswahl verändern" -#~ msgid "Current directory: %s" -#~ msgstr "Aktuelles Verzeichnis: %s" -#~ msgid "error: too many open files" -#~ msgstr "Fehler: zu viele offene Dateien" -#~ msgid "Line endings" -#~ msgstr "Zeilenenden" -#~ msgid "Toolbar" -#~ msgstr "Werkzeugleiste" -#~ msgid "Build with \"make\" (custom target)" -#~ msgstr "Mit \"make\" erstellen (eigenes Target angeben)" -#~ msgid "Build with \"_make\" (custom _target)" -#~ msgstr "Mit \"make\" erstellen (eigenes Target angeben)" -#~ msgid "Error while converting file (%s)." -#~ msgstr "Fehler bei der Umwandlung der Datei (%s)." - Modified: trunk/po/geany.pot =================================================================== --- trunk/po/geany.pot 2006-08-21 17:21:50 UTC (rev 753) +++ trunk/po/geany.pot 2006-08-21 22:28:36 UTC (rev 754) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-02 11:35+0200\n" +"POT-Creation-Date: 2006-08-21 22:43+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,39 +16,44 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/main.c:76 +#: src/main.c:86 msgid "runs in debug mode (means being verbose)" msgstr "" -#: src/main.c:77 +#: src/main.c:87 msgid "don't load auto completion data (see documentation)" msgstr "" -#: src/main.c:79 +#: src/main.c:89 msgid "don't open files in a running instance, force opening a new instance" msgstr "" -#: src/main.c:81 +#: src/main.c:91 msgid "use an alternate configuration directory" msgstr "" -#: src/main.c:82 +#: src/main.c:92 msgid "don't show message window at startup" msgstr "" -#: src/main.c:84 +#: src/main.c:94 msgid "don't load terminal support" msgstr "" -#: src/main.c:85 +#: src/main.c:95 msgid "filename of libvte.so" msgstr "" -#: src/main.c:87 +#: src/main.c:97 msgid "show version and exit" msgstr "" -#: src/main.c:428 +#: src/main.c:382 +#, c-format +msgid "Could not find file \"%s\".\n" +msgstr "" + +#: src/main.c:416 msgid "" "Geany is exiting because a named pipe was found. Mostly this means, Geany is " "already running. If you know Geany is not running, you can delete the file " @@ -56,16 +61,16 @@ "Delete the named pipe and start Geany?" msgstr "" -#: src/main.c:491 +#: src/main.c:506 msgid " - A fast and lightweight IDE" msgstr "" -#: src/main.c:501 +#: src/main.c:516 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "" -#: src/main.c:524 +#: src/main.c:558 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -73,1055 +78,1067 @@ "Start Geany anyway?" msgstr "" -#: src/main.c:591 +#: src/main.c:654 #, c-format msgid "This is Geany %s." msgstr "" -#: src/main.c:593 +#: src/main.c:656 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "" -#: src/main.c:617 src/callbacks.c:838 src/dialogs.c:150 src/document.c:367 -#: src/document.c:400 src/win32.c:150 +#: src/main.c:681 src/callbacks.c:840 src/dialogs.c:146 src/document.c:364 +#: src/document.c:397 src/win32.c:150 #, c-format msgid "" "You have opened too many files. There is a limit of %d concurrent open files." msgstr "" -#: src/interface.c:236 src/interface.c:1346 +#: src/interface.c:240 src/interface.c:1364 msgid "Geany" msgstr "" -#: src/interface.c:246 +#: src/interface.c:250 msgid "_File" msgstr "" -#: src/interface.c:257 +#: src/interface.c:261 msgid "New (with _template)" msgstr "" -#: src/interface.c:268 src/interface.c:287 src/interface.c:331 -#: src/interface.c:442 src/interface.c:714 src/interface.c:724 -#: src/interface.c:1778 +#: 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 msgid "invisible" msgstr "" -#: src/interface.c:280 +#: src/interface.c:284 msgid "Recent _files" msgstr "" -#: src/interface.c:303 +#: src/interface.c:307 msgid "Save a_ll" msgstr "" -#: src/interface.c:306 +#: src/interface.c:310 msgid "Saves all open files" msgstr "" -#: src/interface.c:312 +#: src/interface.c:316 src/callbacks.c:509 src/utils.c:965 msgid "_Reload" msgstr "" -#: src/interface.c:320 +#: src/interface.c:324 msgid "R_eload as" msgstr "" -#: src/interface.c:351 +#: src/interface.c:355 msgid "Prints the current file" msgstr "" -#: src/interface.c:362 +#: src/interface.c:366 msgid "C_lose all" msgstr "" -#: src/interface.c:365 +#: src/interface.c:369 msgid "Closes all open files" msgstr "" -#: src/interface.c:379 src/interface.c:955 +#: src/interface.c:383 src/interface.c:973 msgid "Quit Geany" msgstr "" -#: src/interface.c:381 +#: src/interface.c:385 msgid "_Edit" msgstr "" -#: src/interface.c:422 src/interface.c:1741 +#: src/interface.c:426 src/interface.c:1765 msgid "Select _All" msgstr "" -#: src/interface.c:431 +#: src/interface.c:435 msgid "_Insert \"include <...>\"" msgstr "" -#: src/interface.c:445 +#: src/interface.c:449 msgid "I_nsert Comments" msgstr "" -#: src/interface.c:456 src/interface.c:1792 +#: src/interface.c:460 src/interface.c:1816 msgid "Insert ChangeLog entry" msgstr "" -#: src/interface.c:459 +#: src/interface.c:463 msgid "Inserts a typical ChangeLog entry in the current file" msgstr "" -#: src/interface.c:461 src/interface.c:1797 +#: src/interface.c:465 src/interface.c:1821 msgid "Insert file header" msgstr "" -#: src/interface.c:464 src/interface.c:1800 +#: src/interface.c:468 src/interface.c:1824 msgid "Inserts a few information at the beginning of the file" msgstr "" -#: src/interface.c:466 src/interface.c:1802 +#: src/interface.c:470 src/interface.c:1826 msgid "Insert function description" msgstr "" -#: src/interface.c:469 src/interface.c:1805 +#: src/interface.c:473 src/interface.c:1829 msgid "Inserts a description before the current function" msgstr "" -#: src/interface.c:471 src/interface.c:1807 +#: src/interface.c:475 src/interface.c:1831 msgid "Insert multiline comment" msgstr "" -#: src/interface.c:474 src/interface.c:1810 +#: src/interface.c:478 src/interface.c:1834 msgid "Inserts a multiline comment" msgstr "" -#: src/interface.c:476 src/interface.c:1812 +#: src/interface.c:480 src/interface.c:1836 msgid "Insert GPL notice" msgstr "" -#: src/interface.c:479 src/interface.c:1815 +#: src/interface.c:483 src/interface.c:1839 msgid "Inserts a GPL notice (should be done at the beginning of the file)" msgstr "" -#: src/interface.c:486 src/interface.c:1822 +#: src/interface.c:485 src/interface.c:1841 +msgid "Insert Dat_e" +msgstr "" + +#: src/interface.c:500 src/interface.c:1856 msgid "_Format" msgstr "" -#: src/interface.c:489 +#: src/interface.c:503 msgid "Convert the case of the current selection" msgstr "" -#: src/interface.c:494 src/interface.c:1829 +#: src/interface.c:508 src/interface.c:1863 msgid "Convert Selection to _lower-case" msgstr "" -#: src/interface.c:498 src/interface.c:1833 +#: src/interface.c:512 src/interface.c:1867 msgid "Convert Selection to _upper-case" msgstr "" -#: src/interface.c:507 src/interface.c:1842 +#: src/interface.c:521 src/interface.c:1876 msgid "_Comment Line" msgstr "" -#: src/interface.c:511 src/interface.c:1846 +#: src/interface.c:525 src/interface.c:1880 msgid "_Uncomment Line" msgstr "" -#: src/interface.c:515 src/interface.c:1850 +#: src/interface.c:529 src/interface.c:1884 msgid "D_uplicate Line" msgstr "" -#: src/interface.c:524 src/interface.c:1859 +#: src/interface.c:538 src/interface.c:1893 msgid "_Increase Indent" msgstr "" -#: src/interface.c:528 src/interface.c:1863 +#: src/interface.c:542 src/interface.c:1897 msgid "_Decrease Indent" msgstr "" -#: src/interface.c:532 +#: src/interface.c:546 msgid "Count _words" msgstr "" -#: src/interface.c:535 +#: src/interface.c:549 msgid "" "Counts the words and characters in the current selection or the whole " "document" msgstr "" -#: src/interface.c:546 +#: src/interface.c:560 msgid "_Search" msgstr "" -#: src/interface.c:557 +#: src/interface.c:571 msgid "Find _Next" msgstr "" -#: src/interface.c:561 +#: src/interface.c:575 msgid "Find _Previous" msgstr "" -#: src/interface.c:565 src/dialogs.c:926 +#: src/interface.c:579 src/search.c:278 msgid "_Replace" msgstr "" -#: src/interface.c:578 +#: src/interface.c:592 msgid "Find in f_iles" msgstr "" -#: src/interface.c:587 +#: src/interface.c:601 msgid "_Go to line" msgstr "" -#: src/interface.c:595 src/dialogs.c:73 +#: src/interface.c:609 src/dialogs.c:70 msgid "_View" msgstr "" -#: src/interface.c:602 +#: src/interface.c:616 msgid "Change _Font" msgstr "" -#: src/interface.c:605 +#: src/interface.c:619 msgid "Change the default font" msgstr "" -#: src/interface.c:611 +#: src/interface.c:625 msgid "Show _Colour Chooser" msgstr "" -#: src/interface.c:614 src/interface.c:894 +#: src/interface.c:628 src/interface.c:912 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette." msgstr "" -#: src/interface.c:625 +#: src/interface.c:639 msgid "Full_screen" msgstr "" -#: src/interface.c:629 +#: src/interface.c:643 msgid "Show Messages _Window" msgstr "" -#: src/interface.c:632 +#: src/interface.c:646 msgid "Toggle the window with status and compiler messages on and off" msgstr "" -#: src/interface.c:635 +#: src/interface.c:649 msgid "Show _Toolbar" msgstr "" -#: src/interface.c:638 +#: src/interface.c:652 msgid "Toggle the toolbar on and off" msgstr "" -#: src/interface.c:641 +#: src/interface.c:655 msgid "Show Side_bar" msgstr "" -#: src/interface.c:646 +#: src/interface.c:660 msgid "Show _Markers Margin" msgstr "" -#: src/interface.c:649 +#: src/interface.c:663 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines." msgstr "" -#: src/interface.c:652 +#: src/interface.c:666 msgid "Show _Line Numbers" msgstr "" -#: src/interface.c:655 +#: src/interface.c:669 msgid "Shows or hides the Line Number margin." msgstr "" -#: src/interface.c:675 +#: src/interface.c:689 msgid "_Document" msgstr "" -#: src/interface.c:682 +#: src/interface.c:696 msgid "_Line wrapping" msgstr "" -#: src/interface.c:685 src/interface.c:2949 +#: src/interface.c:699 src/interface.c:2990 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:688 +#: src/interface.c:702 msgid "_Use auto indentation" msgstr "" -#: src/interface.c:693 +#: src/interface.c:707 msgid "Read _only" msgstr "" -#: src/interface.c:696 +#: src/interface.c:710 msgid "Treat this file as read-only. No changes can be made." msgstr "" -#: src/interface.c:698 +#: src/interface.c:712 msgid "_Write Unicode BOM" msgstr "" -#: src/interface.c:707 +#: src/interface.c:721 msgid "Set file_type" msgstr "" -#: src/interface.c:717 +#: src/interface.c:731 msgid "Set _encoding" msgstr "" -#: src/interface.c:727 +#: src/interface.c:741 msgid "Set line e_ndings" msgstr "" -#: src/interface.c:734 +#: src/interface.c:748 msgid "Convert and set to _CR/LF (Win)" msgstr "" -#: src/interface.c:738 +#: src/interface.c:753 msgid "Convert and set to _LF (Unix)" msgstr "" -#: src/interface.c:742 +#: src/interface.c:758 msgid "Convert and set to CR (_Mac)" msgstr "" -#: src/interface.c:751 +#: src/interface.c:769 msgid "_Replace tabs by spaces" msgstr "" -#: src/interface.c:754 src/interface.c:2882 +#: src/interface.c:772 src/interface.c:2923 msgid "Replaces all tabs in document by spaces." msgstr "" -#: src/interface.c:761 +#: src/interface.c:779 msgid "_Fold all" msgstr "" -#: src/interface.c:764 +#: src/interface.c:782 msgid "Folds all contractible code blocks" msgstr "" -#: src/interface.c:766 +#: src/interface.c:784 msgid "_Unfold all" msgstr "" -#: src/interface.c:769 +#: src/interface.c:787 msgid "Unfolds all contracted code blocks" msgstr "" -#: src/interface.c:776 +#: src/interface.c:794 msgid "Remove all _indicators" msgstr "" -#: src/interface.c:779 +#: src/interface.c:797 msgid "Removes all set indicators in the current document." msgstr "" #. build the code -#: src/interface.c:781 src/dialogs.c:490 +#: src/interface.c:799 src/dialogs.c:485 msgid "_Build" msgstr "" -#: src/interface.c:785 +#: src/interface.c:803 msgid "_Help" msgstr "" -#: src/interface.c:796 +#: src/interface.c:814 msgid "_Keyboard shortcuts" msgstr "" -#: src/interface.c:799 +#: src/interface.c:817 msgid "Shows a list of all keyboard shortcuts for Geany." msgstr "" -#: src/interface.c:801 +#: src/interface.c:819 msgid "_Website" msgstr "" -#: src/interface.c:824 +#: src/interface.c:842 msgid "Create a new file" msgstr "" -#: src/interface.c:829 +#: src/interface.c:847 msgid "Open an existing file" msgstr "" -#: src/interface.c:834 +#: src/interface.c:852 msgid "Save the current file" msgstr "" -#: src/interface.c:836 src/keybindings.c:121 +#: src/interface.c:854 src/keybindings.c:121 msgid "Save all" msgstr "" -#: src/interface.c:839 +#: src/interface.c:857 msgid "Save all open files" msgstr "" -#: src/interface.c:848 +#: src/interface.c:866 msgid "Reload the current file from disk" msgstr "" -#: src/interface.c:853 +#: src/interface.c:871 msgid "Close the current file" msgstr "" -#: src/interface.c:862 +#: src/interface.c:880 msgid "Undo the last modification" msgstr "" -#: src/interface.c:867 +#: src/interface.c:885 msgid "Redo the last modification" msgstr "" -#: src/interface.c:875 src/keybindings.c:167 +#: src/interface.c:893 src/keybindings.c:169 msgid "Compile" msgstr "" -#: src/interface.c:878 +#: src/interface.c:896 msgid "Compile the current file" msgstr "" -#: src/interface.c:883 src/dialogs.c:543 +#: src/interface.c:901 src/dialogs.c:538 msgid "Run or view the current file" msgstr "" -#: src/interface.c:891 +#: src/interface.c:909 msgid "Color" msgstr "" -#: src/interface.c:903 +#: src/interface.c:921 msgid "Zoom in the text" msgstr "" -#: src/interface.c:908 +#: src/interface.c:926 msgid "Zoom out the text" msgstr "" -#: src/interface.c:921 src/interface.c:926 +#: src/interface.c:939 src/interface.c:944 msgid "Find the entered text in the current file" msgstr "" -#: src/interface.c:939 +#: src/interface.c:957 msgid "Enter a line number and jump to it." msgstr "" -#: src/interface.c:946 +#: src/interface.c:964 msgid "Jump to the entered line number." msgstr "" -#: src/interface.c:982 src/treeviews.c:41 +#: src/interface.c:1000 src/treeviews.c:41 msgid "Symbols" msgstr "" -#: src/interface.c:995 src/treeviews.c:208 +#: src/interface.c:1013 src/treeviews.c:208 msgid "Open files" msgstr "" -#: src/interface.c:1030 +#: src/interface.c:1048 msgid "Status" msgstr "" -#: src/interface.c:1044 +#: src/interface.c:1062 msgid "Compiler" msgstr "" -#: src/interface.c:1058 +#: src/interface.c:1076 msgid "Messages" msgstr "" -#: src/interface.c:1071 +#: src/interface.c:1089 msgid "Scribble" msgstr "" -#: src/interface.c:1568 src/interface.c:2723 +#: src/interface.c:1589 src/interface.c:2764 msgid "Images and text" msgstr "" -#: src/interface.c:1574 src/interface.c:2731 +#: src/interface.c:1595 src/interface.c:2772 msgid "Images only" msgstr "" -#: src/interface.c:1580 src/interface.c:2739 +#: src/interface.c:1601 src/interface.c:2780 msgid "Text only" msgstr "" -#: src/interface.c:1591 src/interface.c:2747 +#: src/interface.c:1612 src/interface.c:2788 msgid "Large icons" msgstr "" -#: src/interface.c:1596 src/interface.c:2755 +#: src/interface.c:1617 src/interface.c:2796 msgid "Small icons" msgstr "" -#: src/interface.c:1606 +#: src/interface.c:1627 msgid "Hide toolbar" msgstr "" -#: src/interface.c:1767 +#: src/interface.c:1791 msgid "Insert \"include <...>\"" msgstr "" -#: src/interface.c:1781 +#: src/interface.c:1805 msgid "Insert Comments" msgstr "" -#: src/interface.c:1795 +#: src/interface.c:1819 msgid "Inserts a typical ChangeLog entry in the current " msgstr "" -#: src/interface.c:1872 +#: src/interface.c:1906 msgid "Find usage" msgstr "" -#: src/interface.c:1880 src/keybindings.c:222 +#: src/interface.c:1914 src/keybindings.c:224 msgid "Go to tag definition" msgstr "" -#: src/interface.c:1884 src/keybindings.c:224 +#: src/interface.c:1918 src/keybindings.c:226 msgid "Go to tag declaration" msgstr "" -#: src/interface.c:1893 src/dialogs.c:743 src/keybindings.c:147 +#: src/interface.c:1927 src/dialogs.c:739 src/keybindings.c:149 msgid "Go to line" msgstr "" -#: src/interface.c:1896 +#: src/interface.c:1930 msgid "Goto to the entered line" msgstr "" -#: src/interface.c:2228 src/keybindings.c:137 +#: src/interface.c:2269 src/keybindings.c:139 msgid "Preferences" msgstr "" -#: src/interface.c:2257 +#: src/interface.c:2298 msgid "Load files from the last session" msgstr "" -#: src/interface.c:2261 +#: src/interface.c:2302 msgid "Opens at startup the files from the last session" msgstr "" -#: src/interface.c:2264 +#: src/interface.c:2305 msgid "Save window position and geometry" msgstr "" -#: src/interface.c:2268 +#: src/interface.c:2309 msgid "Saves the window position and geometry and restores it at the start" msgstr "" -#: src/interface.c:2271 +#: src/interface.c:2312 msgid "Beep on errors or when compilation has finished" msgstr "" -#: src/interface.c:2274 +#: src/interface.c:2315 msgid "" "Whether to beep if an error occured or when the compilation process has " "finished." msgstr "" -#: src/interface.c:2277 +#: src/interface.c:2318 msgid "Switch to status message list at new message" msgstr "" -#: src/interface.c:2280 +#: src/interface.c:2321 msgid "" "Switch to the status message tab(in the notebook window at the bottom) if a " "new status message arrive." msgstr "" -#: src/interface.c:2283 +#: src/interface.c:2324 msgid "Load virtual terminal emulation at startup" msgstr "" -#: src/interface.c:2285 +#: src/interface.c:2326 msgid "" "Whether the virtual terminal emulation(VTE) should be loaded at startup. " "Disable it if you do not need it." msgstr "" -#: src/interface.c:2288 +#: src/interface.c:2329 msgid "Confirm exit" msgstr "" -#: src/interface.c:2292 +#: src/interface.c:2333 msgid "Shows a confirmation dialog on exit." msgstr "" -#: src/interface.c:2303 +#: src/interface.c:2344 msgid "Recent files list length:" msgstr "" -#: src/interface.c:2311 +#: src/interface.c:2352 msgid "" "Specifies the number of files which are stored in the Recent files list." msgstr "" -#: src/interface.c:2319 +#: src/interface.c:2360 msgid "Placement of new file tabs: " msgstr "" -#: src/interface.c:2323 src/interface.c:2579 src/interface.c:2589 -#: src/interface.c:2599 +#: src/interface.c:2364 src/interface.c:2620 src/interface.c:2630 +#: src/interface.c:2640 msgid "Left" msgstr "" -#: src/interface.c:2326 +#: src/interface.c:2367 msgid "New file tabs will be placed to the left of the tab list" msgstr "" -#: src/interface.c:2335 src/interface.c:2580 src/interface.c:2590 -#: src/interface.c:2600 +#: src/interface.c:2376 src/interface.c:2621 src/interface.c:2631 +#: src/interface.c:2641 msgid "Right" msgstr "" -#: src/interface.c:2338 +#: src/interface.c:2379 msgid "New file tabs will be placed to the right of the tab list" msgstr "" -#: src/interface.c:2347 +#: src/interface.c:2388 msgid "General" msgstr "" -#: src/interface.c:2369 +#: src/interface.c:2410 msgid "Show symbol list" msgstr "" -#: src/interface.c:2372 src/interface.c:2378 +#: src/interface.c:2413 src/interface.c:2419 msgid "Toggle the symbol list on and off" msgstr "" -#: src/interface.c:2375 +#: src/interface.c:2416 msgid "Show open files list" msgstr "" -#: src/interface.c:2381 +#: src/interface.c:2422 msgid "Sidebar" msgstr "" -#: src/interface.c:2402 +#: src/interface.c:2443 msgid "Symbol list font" msgstr "" -#: src/interface.c:2409 +#: src/interface.c:2450 msgid "Message window font" msgstr "" -#: src/interface.c:2421 +#: src/interface.c:2462 msgid "Sets the font for the message window" msgstr "" -#: src/interface.c:2429 +#: src/interface.c:2470 msgid "Sets the font for symbol list window" msgstr "" -#: src/interface.c:2432 +#: src/interface.c:2473 msgid "Editor font" msgstr "" -#: src/interface.c:2444 +#: src/interface.c:2485 msgid "Sets the font for the editors windows" msgstr "" -#: src/interface.c:2446 +#: src/interface.c:2487 msgid "Fonts" msgstr "" -#: src/interface.c:2467 +#: src/interface.c:2508 msgid "Long line marker" msgstr "" -#: src/interface.c:2474 +#: src/interface.c:2515 msgid "Long line marker color" msgstr "" -#: src/interface.c:2487 +#: src/interface.c:2528 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 "" -#: src/interface.c:2491 +#: src/interface.c:2532 msgid "Type" msgstr "" -#: src/interface.c:2504 +#: src/interface.c:2545 msgid "Line" msgstr "" -#: src/interface.c:2507 @@ 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: [753] trunk
by eht16＠users.sourceforge.net 21 Aug '06

21 Aug '06

Revision: 753 Author: eht16 Date: 2006-08-21 10:21:50 -0700 (Mon, 21 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=753&view=rev Log Message: ----------- Updated Scintilla to version 1.71. Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/Converter.h trunk/scintilla/Editor.cxx trunk/scintilla/LexCPP.cxx trunk/scintilla/LexPerl.cxx trunk/scintilla/PlatGTK.cxx trunk/scintilla/PropSet.cxx trunk/scintilla/ScintillaGTK.cxx trunk/scintilla/StyleContext.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-21 17:07:44 UTC (rev 752) +++ trunk/ChangeLog 2006-08-21 17:21:50 UTC (rev 753) @@ -3,6 +3,7 @@ * src/images.c, src/notebook.c: Applied patch from Củ Văn Chuối to enlarge the tab close icon. This should fix some display issues. + * scintilla/*: Updated Scintilla to version 1.71. 2006-08-20 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/scintilla/Converter.h =================================================================== --- trunk/scintilla/Converter.h 2006-08-21 17:07:44 UTC (rev 752) +++ trunk/scintilla/Converter.h 2006-08-21 17:21:50 UTC (rev 753) @@ -23,6 +23,16 @@ */ class Converter { ConverterHandle iconvh; + void OpenHandle(const char *fullDestination, const char *charSetSource) { +#if GTK_MAJOR_VERSION >= 2 + iconvh = g_iconv_open(fullDestination, charSetSource); +#else + iconvh = iconv_open(fullDestination, charSetSource); +#endif + } + bool Succeeded() const { + return iconvh != iconvhBad; + } public: Converter() { iconvh = iconvhBad; @@ -35,25 +45,26 @@ Close(); } operator bool() const { - return iconvh != iconvhBad; + return Succeeded(); } void Open(const char *charSetDestination, const char *charSetSource, bool transliterations=true) { Close(); if (*charSetSource) { - char fullDest[200]; - strcpy(fullDest, charSetDestination); + // Try allowing approximate transliterations if (transliterations) { + char fullDest[200]; + strcpy(fullDest, charSetDestination); strcat(fullDest, "//TRANSLIT"); + OpenHandle(fullDest, charSetSource); } -#if GTK_MAJOR_VERSION >= 2 - iconvh = g_iconv_open(fullDest, charSetSource); -#else - iconvh = iconv_open(fullDest, charSetSource); -#endif + if (!Succeeded()) { + // Transliterations failed so try basic name + OpenHandle(charSetDestination, charSetSource); + } } } void Close() { - if (iconvh != iconvhBad) { + if (Succeeded()) { #if GTK_MAJOR_VERSION >= 2 g_iconv_close(iconvh); #else @@ -63,7 +74,7 @@ } } size_t Convert(char** src, size_t *srcleft, char **dst, size_t *dstleft) const { - if (iconvh == iconvhBad) { + if (!Succeeded()) { return (size_t)(-1); } else { #if GTK_MAJOR_VERSION >= 2 Modified: trunk/scintilla/Editor.cxx =================================================================== --- trunk/scintilla/Editor.cxx 2006-08-21 17:07:44 UTC (rev 752) +++ trunk/scintilla/Editor.cxx 2006-08-21 17:21:50 UTC (rev 753) @@ -3612,9 +3612,11 @@ NotifyParent(scn); } -void Editor::NotifyDoubleClick(Point, bool) { +void Editor::NotifyDoubleClick(Point pt, bool) { SCNotification scn = {0}; scn.nmhdr.code = SCN_DOUBLECLICK; + scn.line = LineFromLocation(pt); + scn.position = PositionFromLocationClose(pt); NotifyParent(scn); } Modified: trunk/scintilla/LexCPP.cxx =================================================================== --- trunk/scintilla/LexCPP.cxx 2006-08-21 17:07:44 UTC (rev 752) +++ trunk/scintilla/LexCPP.cxx 2006-08-21 17:21:50 UTC (rev 753) @@ -20,28 +20,45 @@ #include "Scintilla.h" #include "SciLexer.h" -#define KEYWORD_BOXHEADER 1 -#define KEYWORD_FOLDCONTRACTED 2 +#define SET_LOWER "abcdefghijklmnopqrstuvwxyz" +#define SET_UPPER "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +#define SET_DIGITS "0123456789" -static bool IsOKBeforeRE(int ch) { - return (ch == '(') || (ch == '=') || (ch == ','); -} +class SetOfCharacters { + int size; + bool valueAfter; + bool *bset; +public: + SetOfCharacters(const char *setOfCharacters, int size_=0x80, bool valueAfter_=false) { + size = size_; + valueAfter = valueAfter_; + bset = new bool[size]; + for (int i=0; i < size; i++) { + bset[i] = false; + } + for (const char *cp=setOfCharacters; *cp; cp++) { + int val = static_cast<unsigned char>(*cp); + PLATFORM_ASSERT(val >= 0); + PLATFORM_ASSERT(val < size); + bset[val] = true; + } + } + ~SetOfCharacters() { + delete []bset; + bset = 0; + size = 0; + } + void Add(int val) { + PLATFORM_ASSERT(val >= 0); + PLATFORM_ASSERT(val < size); + bset[val] = true; + } + bool Contains(int val) { + PLATFORM_ASSERT(val >= 0); + return (val < size) ? bset[val] : valueAfter; + } +}; -static inline bool IsAWordChar(int ch) { - return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_'); -} - -static inline bool IsAWordStart(int ch) { - return (ch < 0x80) && (isalpha(ch) || ch == '_'); -} - -static inline bool IsADoxygenChar(int ch) { - return (ch < 0x80 && islower(ch)) || ch == '$' || ch == '@' || - ch == '\\' || ch == '&' || ch == '<' || - ch == '>' || ch == '#' || ch == '{' || - ch == '}' || ch == '[' || ch == ']'; -} - static bool IsSpaceEquiv(int state) { return (state <= SCE_C_COMMENTDOC) || // including SCE_C_DEFAULT, SCE_C_COMMENT, SCE_C_COMMENTLINE @@ -59,6 +76,17 @@ bool stylingWithinPreprocessor = styler.GetPropertyInt("styling.within.preprocessor") != 0; + SetOfCharacters setOKBeforeRE("(=,"); + + SetOfCharacters setDoxygen("$@\\&<>#{}[]" SET_LOWER); + + SetOfCharacters setWordStart("_" SET_LOWER SET_UPPER, 0x80, true); + SetOfCharacters setWord("._" SET_LOWER SET_UPPER SET_DIGITS, 0x80, true); + if (styler.GetPropertyInt("lexer.cpp.allow.dollars", 1) != 0) { + setWordStart.Add('$'); + setWord.Add('$'); + } + int chPrevNonWhite = ' '; int visibleChars = 0; bool lastWordWasUUID = false; @@ -97,7 +125,7 @@ if (sc.atLineStart) { if (sc.state == SCE_C_STRING) { - // Prevent SCE_C_STRINGEOL from leaking back to previous line which + // Prevent SCE_C_STRINGEOL from leaking back to previous line which // ends with a line continuation by locking in the state upto this position. sc.SetState(SCE_C_STRING); } @@ -126,12 +154,12 @@ break; case SCE_C_NUMBER: // We accept almost anything because of hex. and number suffixes - if (!IsAWordChar(sc.ch)) { + if (!setWord.Contains(sc.ch)) { sc.SetState(SCE_C_DEFAULT); } break; case SCE_C_IDENTIFIER: - if (!IsAWordChar(sc.ch) || (sc.ch == '.')) { + if (!setWord.Contains(sc.ch) || (sc.ch == '.')) { char s[1000]; if (caseSensitive) { sc.GetCurrent(s, sizeof(s)); @@ -201,14 +229,14 @@ sc.ChangeState(SCE_C_COMMENTDOCKEYWORDERROR); sc.Forward(); sc.ForwardSetState(SCE_C_DEFAULT); - } else if (!IsADoxygenChar(sc.ch)) { + } else if (!setDoxygen.Contains(sc.ch)) { char s[100]; if (caseSensitive) { sc.GetCurrent(s, sizeof(s)); } else { sc.GetCurrentLowered(s, sizeof(s)); } - if (!isspace(sc.ch) || !keywords3.InList(s + 1)) { + if (!IsASpace(sc.ch) || !keywords3.InList(s + 1)) { sc.ChangeState(SCE_C_COMMENTDOCKEYWORDERROR); } sc.SetState(styleBeforeDCKeyword); @@ -283,7 +311,7 @@ } else { sc.SetState(SCE_C_NUMBER); } - } else if (IsAWordStart(sc.ch) || (sc.ch == '@')) { + } else if (setWordStart.Contains(sc.ch) || (sc.ch == '@')) { if (lastWordWasUUID) { sc.SetState(SCE_C_UUID); lastWordWasUUID = false; @@ -303,7 +331,7 @@ sc.SetState(SCE_C_COMMENTLINEDOC); else sc.SetState(SCE_C_COMMENTLINE); - } else if (sc.ch == '/' && IsOKBeforeRE(chPrevNonWhite)) { + } else if (sc.ch == '/' && setOKBeforeRE.Contains(chPrevNonWhite)) { sc.SetState(SCE_C_REGEX); // JavaScript's RegEx } else if (sc.ch == '\"') { sc.SetState(SCE_C_STRING); @@ -428,7 +456,7 @@ levelMinCurrent = levelCurrent; visibleChars = 0; } - if (!isspacechar(ch)) + if (!IsASpace(ch)) visibleChars++; } } Modified: trunk/scintilla/LexPerl.cxx =================================================================== --- trunk/scintilla/LexPerl.cxx 2006-08-21 17:07:44 UTC (rev 752) +++ trunk/scintilla/LexPerl.cxx 2006-08-21 17:21:50 UTC (rev 753) @@ -68,14 +68,22 @@ return keywords.InList(s); } +// Note: as lexer uses chars, UTF-8 bytes are considered as <0 values +// Note: iswordchar() was used in only one place in LexPerl, it is +// unnecessary as '.' is processed as the concatenation operator, so +// only isWordStart() is used in LexPerl + +static inline bool isWordStart(char ch) { + return !isascii(ch) || isalnum(ch) || ch == '_'; +} + static inline bool isEndVar(char ch) { - return !isalnum(ch) && ch != '#' && ch != '$' && + return isascii(ch) && !isalnum(ch) && ch != '#' && ch != '$' && ch != '_' && ch != '\''; } - static inline bool isNonQuote(char ch) { - return isalnum(ch) || ch == '_'; + return !isascii(ch) || isalnum(ch) || ch == '_'; } static inline char actualNumStyle(int numberStyle) { @@ -284,7 +292,7 @@ } if (state == SCE_PL_DEFAULT) { - if (isdigit(ch) || (isdigit(chNext) && + if ((isascii(ch) && isdigit(ch)) || (isascii(chNext) && isdigit(chNext) && (ch == '.' || ch == 'v'))) { state = SCE_PL_NUMBER; backflag = BACK_NONE; @@ -295,7 +303,7 @@ numState = PERLNUM_HEX; } else if (chNext == 'b') { numState = PERLNUM_BINARY; - } else if (isdigit(chNext)) { + } else if (isascii(chNext) && isdigit(chNext)) { numState = PERLNUM_OCTAL; } if (numState != PERLNUM_DECIMAL) { @@ -306,7 +314,7 @@ } else if (ch == 'v') { // vector numState = PERLNUM_V_VECTOR; } - } else if (iswordstart(ch)) { + } else if (isWordStart(ch)) { // if immediately prefixed by '::', always a bareword state = SCE_PL_WORD; if (chPrev == ':' && styler.SafeGetCharAt(i - 2) == ':') { @@ -338,7 +346,7 @@ Quote.New(1); kw++; } else if (ch == 'x' && (chNext == '=' || // repetition - (chNext != '_' && !isalnum(chNext)) || + !isWordStart(chNext) || (isdigit(chPrev) && isdigit(chNext)))) { state = SCE_PL_OPERATOR; } @@ -347,7 +355,7 @@ // otherwise it is always a bareword and we skip a lot of scanning // note: keywords assumed to be limited to [_a-zA-Z] only if (state == SCE_PL_WORD) { - while (iswordstart(styler.SafeGetCharAt(kw))) kw++; + while (isWordStart(styler.SafeGetCharAt(kw))) kw++; if (!isPerlKeyword(styler.GetStartSegment(), kw, keywords, styler)) { state = SCE_PL_IDENTIFIER; } @@ -371,7 +379,7 @@ if (ch2 == '{' && !moreback) { // {bareword: possible variable spec brace = true; - } else if ((ch2 == '&') + } else if ((ch2 == '&' && styler.SafeGetCharAt(j - 1) != '&') // &bareword: subroutine call || (ch2 == '>' && styler.SafeGetCharAt(j - 1) == '-') // ->bareword: part of variable spec @@ -403,7 +411,7 @@ backflag = BACK_NONE; // an identifier or bareword if (state == SCE_PL_IDENTIFIER) { - if ((!iswordchar(chNext) && chNext != '\'') + if ((!isWordStart(chNext) && chNext != '\'') || (chNext == '.' && chNext2 == '.')) { // We need that if length of word == 1! // This test is copied from the SCE_PL_WORD handler. @@ -462,7 +470,8 @@ styler.ColourTo(i, SCE_PL_SCALAR); } else { state = SCE_PL_SCALAR; - if (chNext == '`' && chNext2 == '`') { + if ((chNext == '`' && chNext2 == '`') + || (chNext == ':' && chNext2 == ':')) { i += 2; ch = styler.SafeGetCharAt(i); chNext = styler.SafeGetCharAt(i + 1); @@ -474,9 +483,14 @@ } backflag = BACK_NONE; } else if (ch == '@') { - if (isalpha(chNext) || chNext == '#' || chNext == '$' + if (!isascii(chNext) || isalpha(chNext) || chNext == '#' || chNext == '$' || chNext == '_' || chNext == '+' || chNext == '-') { state = SCE_PL_ARRAY; + } else if (chNext == ':' && chNext2 == ':') { + state = SCE_PL_ARRAY; + i += 2; + ch = styler.SafeGetCharAt(i); + chNext = styler.SafeGetCharAt(i + 1); } else if (chNext != '{' && chNext != '[') { styler.ColourTo(i, SCE_PL_ARRAY); } else { @@ -484,12 +498,17 @@ } backflag = BACK_NONE; } else if (ch == '%') { - if (isalpha(chNext) || chNext == '#' || chNext == '$' + if (!isascii(chNext) || isalpha(chNext) || chNext == '#' || chNext == '$' || chNext == '_' || chNext == '!' || chNext == '^') { state = SCE_PL_HASH; i++; ch = chNext; chNext = chNext2; + } else if (chNext == ':' && chNext2 == ':') { + state = SCE_PL_HASH; + i += 2; + ch = styler.SafeGetCharAt(i); + chNext = styler.SafeGetCharAt(i + 1); } else if (chNext == '{') { styler.ColourTo(i, SCE_PL_HASH); } else { @@ -500,8 +519,13 @@ char strch[2]; strch[0] = chNext; strch[1] = '\0'; - if (isalpha(chNext) || chNext == '_' || - NULL != strstr("^/|,\\\";#%^:?<>)[]", strch)) { + if (chNext == ':' && chNext2 == ':') { + state = SCE_PL_SYMBOLTABLE; + i += 2; + ch = styler.SafeGetCharAt(i); + chNext = styler.SafeGetCharAt(i + 1); + } else if (!isascii(chNext) || isalpha(chNext) || chNext == '_' + || NULL != strstr("^/|,\\\";#%^:?<>)[]", strch)) { state = SCE_PL_SYMBOLTABLE; i++; ch = chNext; @@ -748,9 +772,9 @@ if (!isdigit(chNext)) { goto numAtEnd; } - } else if (isalnum(ch)) { + } else if (!isascii(ch) || isalnum(ch)) { if (numState == PERLNUM_VECTOR || numState == PERLNUM_V_VECTOR) { - if (isalpha(ch)) { + if (!isascii(ch) || isalpha(ch)) { if (dotCount == 0) { // change to word state = SCE_PL_IDENTIFIER; } else { // vector then word @@ -765,7 +789,7 @@ ch = chNext; chNext = chNext2; } - } else if (!isdigit(ch)) { // number then word + } else if (!isascii(ch) || !isdigit(ch)) { // number then word goto numAtEnd; } } else if (numState == PERLNUM_FLOAT) { @@ -798,7 +822,7 @@ goto restartLexer; } } else if (state == SCE_PL_IDENTIFIER) { - if (!iswordstart(chNext) && chNext != '\'') { + if (!isWordStart(chNext) && chNext != '\'') { styler.ColourTo(i, SCE_PL_IDENTIFIER); state = SCE_PL_DEFAULT; ch = ' '; @@ -994,7 +1018,7 @@ } } else if (ch == Quote.Up /*&& chPrev != '\\'*/) { Quote.Count++; - } else if (!isalpha(chNext)) { + } else if (!isascii(chNext) || !isalpha(chNext)) { if (Quote.Rep <= 0) { styler.ColourTo(i, state); state = SCE_PL_DEFAULT; @@ -1028,7 +1052,7 @@ if (isspacechar(ch)) { // Keep going } - else if (isalnum(ch)) { + else if (!isascii(ch) || isalnum(ch)) { styler.ColourTo(i, state); state = SCE_PL_DEFAULT; ch = ' '; @@ -1040,7 +1064,7 @@ if (Quote.Count == 0) { Quote.Rep--; } - if (!isalpha(chNext)) { + if (!isascii(chNext) || !isalpha(chNext)) { if (Quote.Rep <= 0) { styler.ColourTo(i, state); state = SCE_PL_DEFAULT; @@ -1052,7 +1076,7 @@ } } else if (ch == Quote.Up /*&& chPrev != '\\'*/) { Quote.Count++; - } else if (!isalpha(chNext)) { + } else if (!isascii(chNext) || !isalpha(chNext)) { if (Quote.Rep <= 0) { styler.ColourTo(i, state); state = SCE_PL_DEFAULT; Modified: trunk/scintilla/PlatGTK.cxx =================================================================== --- trunk/scintilla/PlatGTK.cxx 2006-08-21 17:07:44 UTC (rev 752) +++ trunk/scintilla/PlatGTK.cxx 2006-08-21 17:21:50 UTC (rev 753) @@ -319,7 +319,7 @@ case SC_CHARSET_VIETNAMESE: return "*-*"; case SC_CHARSET_THAI: - return "*-1"; + return "iso8859-11"; case SC_CHARSET_8859_15: return "iso8859-15"; default: @@ -781,7 +781,7 @@ case SC_CHARSET_VIETNAMESE: return ""; case SC_CHARSET_THAI: - return "ISO-8859-1"; + return "ISO-8859-11"; case SC_CHARSET_8859_15: return "ISO-8859-15"; default: Modified: trunk/scintilla/PropSet.cxx =================================================================== --- trunk/scintilla/PropSet.cxx 2006-08-21 17:07:44 UTC (rev 752) +++ trunk/scintilla/PropSet.cxx 2006-08-21 17:21:50 UTC (rev 753) @@ -825,12 +825,12 @@ memcpy(wordsNoCase, words, (len + 1) * sizeof (*words)); } -int cmpString(const void *a1, const void *a2) { +extern "C" int cmpString(const void *a1, const void *a2) { // Can't work out the correct incantation to use modern casts here return strcmp(*(char**)(a1), *(char**)(a2)); } -int cmpStringNoCase(const void *a1, const void *a2) { +extern "C" int cmpStringNoCase(const void *a1, const void *a2) { // Can't work out the correct incantation to use modern casts here return CompareCaseInsensitive(*(char**)(a1), *(char**)(a2)); } Modified: trunk/scintilla/ScintillaGTK.cxx =================================================================== --- trunk/scintilla/ScintillaGTK.cxx 2006-08-21 17:07:44 UTC (rev 752) +++ trunk/scintilla/ScintillaGTK.cxx 2006-08-21 17:21:50 UTC (rev 753) @@ -800,7 +800,7 @@ } #ifdef USE_CONVERTER -static char *ConvertText(int *lenResult, char *s, size_t len, const char *charSetDest, +static char *ConvertText(int *lenResult, char *s, size_t len, const char *charSetDest, const char *charSetSource, bool transliterations) { *lenResult = 0; char *destForm = 0; @@ -1150,10 +1150,16 @@ if (horizEndPreferred < 0) horizEndPreferred = 0; unsigned int pageWidth = rcText.Width(); + unsigned int pageIncrement = pageWidth / 3; + unsigned int charWidth = vs.styles[STYLE_DEFAULT].aveCharWidth; if (GTK_ADJUSTMENT(adjustmenth)->upper != horizEndPreferred || - GTK_ADJUSTMENT(adjustmenth)->page_size != pageWidth) { + GTK_ADJUSTMENT(adjustmenth)->page_size != pageWidth || + GTK_ADJUSTMENT(adjustmenth)->page_increment != pageIncrement || + GTK_ADJUSTMENT(adjustmenth)->step_increment != charWidth) { GTK_ADJUSTMENT(adjustmenth)->upper = horizEndPreferred; + GTK_ADJUSTMENT(adjustmenth)->step_increment = charWidth; GTK_ADJUSTMENT(adjustmenth)->page_size = pageWidth; + GTK_ADJUSTMENT(adjustmenth)->page_increment = pageIncrement; gtk_adjustment_changed(GTK_ADJUSTMENT(adjustmenth)); modified = true; } @@ -1227,8 +1233,6 @@ if (key < 256) { NotifyKey(key, modifiers); return 0; - //~ AddChar(key); - //~ return 1; } else { // Pass up to container in case it is an accelerator NotifyKey(key, modifiers); @@ -1744,13 +1748,13 @@ return FALSE; } } else if (event->button == 4) { - // Wheel scrolling up (only xwin gtk does it this way) + // Wheel scrolling up (only GTK 1.x does it this way) if (ctrl) SetAdjustmentValue(adjustmenth, (xOffset / 2) - 6); else SetAdjustmentValue(adjustmentv, topLine - 3); } else if (event->button == 5) { - // Wheel scrolling down (only xwin gtk does it this way) + // Wheel scrolling down (only GTK 1.x does it this way) if (ctrl) SetAdjustmentValue(adjustmenth, (xOffset / 2) + 6); else @@ -1790,8 +1794,8 @@ return FALSE; } -// win32gtk has a special wheel mouse event for whatever reason and doesn't -// use the button4/5 trick used under X windows. +// win32gtk and GTK >= 2 use SCROLL_* events instead of passing the +// button4/5/6/7 events to the GTK app #if PLAT_GTK_WIN32 || (GTK_MAJOR_VERSION >= 2) gint ScintillaGTK::ScrollEvent(GtkWidget *widget, GdkEventScroll *event) { @@ -1821,7 +1825,7 @@ cLineScroll = 4; sciThis->wheelMouseIntensity = cLineScroll; } - if (event->direction == GDK_SCROLL_UP) { + if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_LEFT) { cLineScroll *= -1; } g_get_current_time(&sciThis->lastWheelMouseTime); @@ -1837,21 +1841,23 @@ return FALSE; } + // Horizontal scrolling + if (event->direction == GDK_SCROLL_LEFT || event->direction == GDK_SCROLL_RIGHT) { + sciThis->HorizontalScrollTo(sciThis->xOffset + cLineScroll); + // Text font size zoom - if (event->state & GDK_CONTROL_MASK) { + } else if (event->state & GDK_CONTROL_MASK) { if (cLineScroll < 0) { sciThis->KeyCommand(SCI_ZOOMIN); - return TRUE; } else { sciThis->KeyCommand(SCI_ZOOMOUT); - return TRUE; } // Regular scrolling } else { sciThis->ScrollTo(sciThis->topLine + cLineScroll); - return TRUE; } + return TRUE; } #endif Modified: trunk/scintilla/StyleContext.h =================================================================== --- trunk/scintilla/StyleContext.h 2006-08-21 17:07:44 UTC (rev 752) +++ trunk/scintilla/StyleContext.h 2006-08-21 17:21:50 UTC (rev 753) @@ -107,16 +107,16 @@ return static_cast<unsigned char>(styler.SafeGetCharAt(currentPos+n)); } bool Match(char ch0) { - return ch == ch0; + return ch == static_cast<unsigned char>(ch0); } bool Match(char ch0, char ch1) { - return (ch == ch0) && (chNext == ch1); + return (ch == static_cast<unsigned char>(ch0)) && (chNext == static_cast<unsigned char>(ch1)); } bool Match(const char *s) { - if (ch != *s) + if (ch != static_cast<unsigned char>(*s)) return false; s++; - if (chNext != *s) + if (chNext != static_cast<unsigned char>(*s)) return false; s++; for (int n=2; *s; n++) { @@ -127,14 +127,14 @@ return true; } bool MatchIgnoreCase(const char *s) { - if (tolower(ch) != *s) + if (tolower(ch) != static_cast<unsigned char>(*s)) return false; s++; - if (tolower(chNext) != *s) + if (tolower(chNext) != static_cast<unsigned char>(*s)) return false; s++; for (int n=2; *s; n++) { - if (*s != + if (static_cast<unsigned char>(*s) != tolower(static_cast<unsigned char>(styler.SafeGetCharAt(currentPos+n)))) return false; s++; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [752] trunk
by eht16＠users.sourceforge.net 21 Aug '06

21 Aug '06

Revision: 752 Author: eht16 Date: 2006-08-21 10:07:44 -0700 (Mon, 21 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=752&view=rev Log Message: ----------- Enlarged the tab close icon. This should fix some display issues. Modified Paths: -------------- trunk/ChangeLog trunk/src/images.c trunk/src/notebook.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-20 20:39:59 UTC (rev 751) +++ trunk/ChangeLog 2006-08-21 17:07:44 UTC (rev 752) @@ -1,3 +1,10 @@ +2006-08-21 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/images.c, src/notebook.c: + Applied patch from Củ Văn Chuối to enlarge the tab close icon. This + should fix some display issues. + + 2006-08-20 Enrico Tröger <enrico.troeger(a)uvena.de> * src/build.c, src/document.c, src/document.h, src/geany.h, Modified: trunk/src/images.c =================================================================== --- trunk/src/images.c 2006-08-20 20:39:59 UTC (rev 751) +++ trunk/src/images.c 2006-08-21 17:07:44 UTC (rev 752) @@ -218,26 +218,25 @@ { "" /* Pixbuf magic (0x47646b50) */ "GdkP" - /* length: header (24) + pixel_data (196) */ - "\0\0\0\334" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (28) */ - "\0\0\0\34" - /* width (7) */ - "\0\0\0\7" - /* height (7) */ - "\0\0\0\7" + /* length: header (24) + pixel_data (171) */ + "\0\0\0\303" + /* pixdata_type (0x2010002) */ + "\2\1\0\2" + /* rowstride (40) */ + "\0\0\0(" + /* width (10) */ + "\0\0\0\12" + /* height (10) */ + "\0\0\0\12" /* pixel_data: */ - "\0\0\0\0\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0" - "\0\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377" - "\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\377\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\377\0\0\0\377"}; + "\2\0\0\0\10\0\0\0\35\206\0\0\0\0\202\0\0\0\15\1\0\0\0\1\202\0\0\0\377" + "\204\0\0\0\0\202\0\0\0\377\2\0\0\0\31\0\0\0\0\203\0\0\0\377\202\0\0\0" + "\0\203\0\0\0\377\203\0\0\0\0\206\0\0\0\377\205\0\0\0\0\204\0\0\0\377" + "\206\0\0\0\0\204\0\0\0\377\205\0\0\0\0\206\0\0\0\377\203\0\0\0\0\203" + "\0\0\0\377\202\0\0\0\0\203\0\0\0\377\2\0\0\0\0\0\0\0\13\202\0\0\0\377" + "\204\0\0\0\0\202\0\0\0\377\202\0\0\0\22\1\0\0\0\11\206\0\0\0\0\2\0\0" + "\0\21\0\0\0\40"}; - /* GdkPixbuf RGBA C-Source image dump */ #ifdef __SUNPRO_C Modified: trunk/src/notebook.c =================================================================== --- trunk/src/notebook.c 2006-08-20 20:39:59 UTC (rev 751) +++ trunk/src/notebook.c 2006-08-21 17:07:44 UTC (rev 752) @@ -259,7 +259,7 @@ gtk_container_add(GTK_CONTAINER(but), utils_new_image_from_inline(GEANY_IMAGE_SMALL_CROSS, FALSE)); gtk_container_set_border_width(GTK_CONTAINER(but), 0); - gtk_widget_set_size_request(but, 17, 15); + gtk_widget_set_size_request(but, 19, 18); align = gtk_alignment_new(1.0, 0.0, 0.0, 0.0); gtk_container_add(GTK_CONTAINER(align), but); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [751] trunk
by ntrel＠users.sourceforge.net 21 Aug '06

21 Aug '06

Revision: 751 Author: ntrel Date: 2006-08-20 13:39:59 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=751&view=rev Log Message: ----------- Remove filetypes.h and Scintilla includes from geany.h; Add VALID_DOC_IDX macro Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/dialogs.c trunk/src/document.h trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/geany.h trunk/src/highlighting.c trunk/src/highlighting.h trunk/src/keybindings.c trunk/src/sci_cb.c trunk/src/sci_cb.h trunk/src/sciwrappers.c trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-20 15:47:18 UTC (rev 750) +++ trunk/ChangeLog 2006-08-20 20:39:59 UTC (rev 751) @@ -17,6 +17,16 @@ Moved HAVE_FIFO MyApp fields to fifo_info struct in src/main.c. Prevent unnecessary 'does not look like a filename' debug messages. Added fifo_finalize(). + * src/geany.h, src/filetypes.h, document.h, src/highlighting.h, + src/sci_cb.h, src/highlighting.c, src/sciwrappers.c: + Remove filetypes.h and Scintilla includes from geany.h. + * src/document.h: Add VALID_DOC_IDX macro. + * src/utils.h, src/utils.c, src/callbacks.c, src/keybindings.c, + src/sci_cb.h, src/sci_cb.c, src/dialogs.c, src/filetypes.h, + src/filetypes.c: + Move utils_brace_match to sci_cb.c. + Move utils_find_current_word to sci_cb.c. + Move utils_create_file_filter to filetypes.c. 2006-08-19 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-08-20 15:47:18 UTC (rev 750) +++ trunk/src/callbacks.c 2006-08-20 20:39:59 UTC (rev 751) @@ -1042,8 +1042,7 @@ if (event->button == 3) { - utils_find_current_word(doc_list[idx].sci, clickpos, - current_word, sizeof current_word); + sci_cb_find_current_word(doc_list[idx].sci, clickpos, current_word, sizeof current_word); utils_update_popup_goto_items((current_word[0] != '\0') ? TRUE : FALSE); utils_update_popup_copy_items(idx); @@ -1437,7 +1436,7 @@ if (idx == -1 || ! doc_list[idx].is_valid) return; - utils_find_current_word(doc_list[idx].sci, pos, colour, sizeof colour); + sci_cb_find_current_word(doc_list[idx].sci, pos, colour, sizeof colour); dialogs_show_color(colour); } Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-08-20 15:47:18 UTC (rev 750) +++ trunk/src/dialogs.c 2006-08-20 20:39:59 UTC (rev 751) @@ -95,14 +95,14 @@ // add FileFilters(start with "All Files") gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(app->open_filesel), - utils_create_file_filter(filetypes[GEANY_FILETYPES_ALL])); + filetypes_create_file_filter(filetypes[GEANY_FILETYPES_ALL])); for (i = 0; i < GEANY_MAX_FILE_TYPES - 1; i++) { if (filetypes[i]) { gtk_combo_box_append_text(GTK_COMBO_BOX(combo), filetypes[i]->title); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(app->open_filesel), - utils_create_file_filter(filetypes[i])); + filetypes_create_file_filter(filetypes[i])); } } gtk_combo_box_append_text(GTK_COMBO_BOX(combo), _("Detect by file extension ")); Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2006-08-20 15:47:18 UTC (rev 750) +++ trunk/src/document.h 2006-08-20 20:39:59 UTC (rev 751) @@ -24,8 +24,20 @@ #ifndef GEANY_DOCUMENT_H #define GEANY_DOCUMENT_H 1 +#ifndef PLAT_GTK +# define PLAT_GTK 1 // needed for ScintillaWidget.h +#endif + +#include "Scintilla.h" +#include "ScintillaWidget.h" + #include "geany.h" +#include "filetypes.h" +#define VALID_DOC_IDX(idx) \ + ((idx) >= 0 && (idx) < GEANY_MAX_OPEN_FILES && doc_list[idx].is_valid) + + /* structure for representing an open tab with all its related stuff. */ typedef struct document { Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2006-08-20 15:47:18 UTC (rev 750) +++ trunk/src/filetypes.c 2006-08-20 20:39:59 UTC (rev 751) @@ -827,3 +827,24 @@ filetypes[ft]->menu_items->can_exec = TRUE; } } + + +GtkFileFilter *filetypes_create_file_filter(filetype *ft) +{ + GtkFileFilter *new_filter; + gint i; + + new_filter = gtk_file_filter_new(); + gtk_file_filter_set_name(new_filter, ft->title); + + // (GEANY_FILETYPES_MAX_PATTERNS - 1) because the last field in pattern is NULL + //for (i = 0; i < (GEANY_MAX_PATTERNS - 1) && ft->pattern[i]; i++) + for (i = 0; ft->pattern[i]; i++) + { + gtk_file_filter_add_pattern(new_filter, ft->pattern[i]); + } + + return new_filter; +} + + Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2006-08-20 15:47:18 UTC (rev 750) +++ trunk/src/filetypes.h 2006-08-20 20:39:59 UTC (rev 751) @@ -24,7 +24,14 @@ #ifndef GEANY_FILETYPES_H #define GEANY_FILETYPES_H 1 +#ifndef PLAT_GTK +# define PLAT_GTK 1 // needed for ScintillaWidget.h +#endif +#include "Scintilla.h" +#include "ScintillaWidget.h" + + enum { GEANY_FILETYPES_C = 0, @@ -118,4 +125,6 @@ void filetypes_select_radio_item(const filetype *ft); +GtkFileFilter *filetypes_create_file_filter(filetype *ft); + #endif Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-08-20 15:47:18 UTC (rev 750) +++ trunk/src/geany.h 2006-08-20 20:39:59 UTC (rev 751) @@ -29,20 +29,9 @@ #include <gtk/gtk.h> -#ifndef PLAT_GTK -# define PLAT_GTK 1 -#endif - -#include "Scintilla.h" -#include "ScintillaWidget.h" - #include "tm_tagmanager.h" -#include "filetypes.h" -#define SSM(s, m, w, l) scintilla_send_message(s, m, w, l) - - // for detailed description look in the documentation, things are not // listed in the documentation should not be changed ;-) #define GEANY_HOME_DIR g_get_home_dir() Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-08-20 15:47:18 UTC (rev 750) +++ trunk/src/highlighting.c 2006-08-20 20:39:59 UTC (rev 751) @@ -28,6 +28,7 @@ #include "sci_cb.h" #include "utils.h" #include "main.h" +#include "filetypes.h" static style_set *types[GEANY_MAX_FILE_TYPES] = { NULL }; Modified: trunk/src/highlighting.h =================================================================== --- trunk/src/highlighting.h 2006-08-20 15:47:18 UTC (rev 750) +++ trunk/src/highlighting.h 2006-08-20 20:39:59 UTC (rev 751) @@ -24,7 +24,14 @@ #ifndef GEANY_HIGHLIGHTING_H #define GEANY_HIGHLIGHTING_H 1 +#ifndef PLAT_GTK +# define PLAT_GTK 1 // needed for ScintillaWidget.h +#endif +#include "Scintilla.h" +#include "ScintillaWidget.h" + + typedef struct { gint styling[55][4]; Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2006-08-20 15:47:18 UTC (rev 750) +++ trunk/src/keybindings.c 2006-08-20 20:39:59 UTC (rev 751) @@ -633,8 +633,7 @@ pos = sci_get_current_position(doc_list[idx].sci); - utils_find_current_word(doc_list[idx].sci, pos, - current_word, GEANY_MAX_WORD_LENGTH); + sci_cb_find_current_word(doc_list[idx].sci, pos, current_word, GEANY_MAX_WORD_LENGTH); if (*current_word == 0) utils_beep(); Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-08-20 15:47:18 UTC (rev 750) +++ trunk/src/sci_cb.c 2006-08-20 20:39:59 UTC (rev 751) @@ -335,10 +335,47 @@ } +/* Finds a corresponding matching brace to the given pos + * (this is taken from Scintilla Editor.cxx, + * fit to work with sci_cb_close_block) */ +static gint brace_match(ScintillaObject *sci, gint pos) +{ + gchar chBrace = sci_get_char_at(sci, pos); + gchar chSeek = utils_brace_opposite(chBrace); + gint direction, styBrace, depth = 1; + + if (chSeek == '\0') return -1; + styBrace = sci_get_style_at(sci, pos); + direction = -1; + + if (chBrace == '(' || chBrace == '[' || chBrace == '{' || chBrace == '<') + direction = 1; + + pos = pos + direction; + while ((pos >= 0) && (pos < sci_get_length(sci))) + { + gchar chAtPos = sci_get_char_at(sci, pos - 1); + gint styAtPos = sci_get_style_at(sci, pos); + + if ((pos > sci_get_end_styled(sci)) || (styAtPos == styBrace)) + { + if (chAtPos == chBrace) + depth++; + if (chAtPos == chSeek) + depth--; + if (depth == 0) + return pos; + } + pos = pos + direction; + } + return - 1; +} + + void sci_cb_close_block(ScintillaObject *sci, gint pos) { gint x = 0, cnt = 0; - gint start_brace = utils_brace_match(sci, pos); + gint start_brace = brace_match(sci, pos); gint line = sci_get_line_from_position(sci, pos); gint line_start = sci_get_position_from_line(sci, line); gint line_len = sci_get_line_length(sci, line); @@ -377,6 +414,32 @@ } +void sci_cb_find_current_word(ScintillaObject *sci, gint pos, gchar *word, size_t wordlen) +{ + gint line = sci_get_line_from_position(sci, pos); + gint line_start = sci_get_position_from_line(sci, line); + gint startword = pos - line_start; + gint endword = pos - line_start; + gchar *chunk = g_malloc(sci_get_line_length(sci, line) + 1); + + word[0] = '\0'; + sci_get_line(sci, line, chunk); + chunk[sci_get_line_length(sci, line)] = '\0'; + + while (startword > 0 && strchr(GEANY_WORDCHARS, chunk[startword - 1])) + startword--; + while (chunk[endword] && strchr(GEANY_WORDCHARS, chunk[endword])) + endword++; + if(startword == endword) + return; + + chunk[endword] = '\0'; + + g_strlcpy(word, chunk + startword, wordlen); //ensure null terminated + g_free(chunk); +} + + gboolean sci_cb_show_calltip(ScintillaObject *sci, gint pos, gint idx) { gint orig_pos = pos; //the position for the calltip @@ -413,7 +476,7 @@ if (lexer == SCLEX_CPP && (style == SCE_C_COMMENT || style == SCE_C_COMMENTLINE || style == SCE_C_COMMENTDOC)) return FALSE; - utils_find_current_word(sci, pos - 1, word, sizeof word); + sci_cb_find_current_word(sci, pos - 1, word, sizeof word); if (word[0] == '\0') return FALSE; tags = tm_workspace_find(word, tm_tag_max_t, NULL, FALSE, doc_list[idx].file_type->lang); @@ -913,7 +976,8 @@ { gint first_line, last_line; gint x, i, line_start, line_len; - gint sel_start, sel_end, co_len; + gint sel_start, sel_end; + gsize co_len; gchar sel[64], *co, *cc; gboolean break_loop = FALSE, single_line = FALSE; filetype *ft; Modified: trunk/src/sci_cb.h =================================================================== --- trunk/src/sci_cb.h 2006-08-20 15:47:18 UTC (rev 750) +++ trunk/src/sci_cb.h 2006-08-20 20:39:59 UTC (rev 751) @@ -22,7 +22,16 @@ #ifndef GEANY_SCI_CB_H #define GEANY_SCI_CB_H 1 +#ifndef PLAT_GTK +# define PLAT_GTK 1 // needed for ScintillaWidget.h +#endif +#include "Scintilla.h" +#include "ScintillaWidget.h" + +#define SSM(s, m, w, l) scintilla_send_message(s, m, w, l) + + gchar **html_entities; @@ -43,6 +52,8 @@ gboolean sci_cb_handle_xml(ScintillaObject *sci, gchar ch); +void sci_cb_find_current_word(ScintillaObject *sci, gint pos, gchar *word, size_t wordlen); + gboolean sci_cb_show_calltip(ScintillaObject *sci, gint pos, gint idx); void sci_cb_do_comment(gint idx); Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2006-08-20 15:47:18 UTC (rev 750) +++ trunk/src/sciwrappers.c 2006-08-20 20:39:59 UTC (rev 751) @@ -27,7 +27,9 @@ #include "sciwrappers.h" #include "utils.h" +#define SSM(s, m, w, l) scintilla_send_message(s, m, w, l) + // stolen from cssed (http://cssed.sf.net), thanks Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-08-20 15:47:18 UTC (rev 750) +++ trunk/src/utils.c 2006-08-20 20:39:59 UTC (rev 751) @@ -263,25 +263,6 @@ } -GtkFileFilter *utils_create_file_filter(filetype *ft) -{ - GtkFileFilter *new_filter; - gint i; - - new_filter = gtk_file_filter_new(); - gtk_file_filter_set_name(new_filter, ft->title); - - // (GEANY_FILETYPES_MAX_PATTERNS - 1) because the last field in pattern is NULL - //for (i = 0; i < (GEANY_MAX_PATTERNS - 1) && ft->pattern[i]; i++) - for (i = 0; ft->pattern[i]; i++) - { - gtk_file_filter_add_pattern(new_filter, ft->pattern[i]); - } - - return new_filter; -} - - /* taken from anjuta, to determine the EOL mode of the file */ gint utils_get_line_endings(gchar* buffer, glong size) { @@ -1089,32 +1070,6 @@ } -void utils_find_current_word(ScintillaObject *sci, gint pos, gchar *word, size_t wordlen) -{ - gint line = sci_get_line_from_position(sci, pos); - gint line_start = sci_get_position_from_line(sci, line); - gint startword = pos - line_start; - gint endword = pos - line_start; - gchar *chunk = g_malloc(sci_get_line_length(sci, line) + 1); - - word[0] = '\0'; - sci_get_line(sci, line, chunk); - chunk[sci_get_line_length(sci, line)] = '\0'; - - while (startword > 0 && strchr(GEANY_WORDCHARS, chunk[startword - 1])) - startword--; - while (chunk[endword] && strchr(GEANY_WORDCHARS, chunk[endword])) - endword++; - if(startword == endword) - return; - - chunk[endword] = '\0'; - - g_strlcpy(word, chunk + startword, wordlen); //ensure null terminated - g_free(chunk); -} - - /* returns the end-of-line character(s) length of the specified editor */ gint utils_get_eol_char_len(gint idx) { @@ -1422,43 +1377,6 @@ } -/* Finds a corresponding matching brace to the given pos - * (this is taken from Scintilla Editor.cxx, - * fit to work with sci_cb_close_block) */ -gint utils_brace_match(ScintillaObject *sci, gint pos) -{ - gchar chBrace = sci_get_char_at(sci, pos); - gchar chSeek = utils_brace_opposite(chBrace); - gint direction, styBrace, depth = 1; - - if (chSeek == '\0') return -1; - styBrace = sci_get_style_at(sci, pos); - direction = -1; - - if (chBrace == '(' || chBrace == '[' || chBrace == '{' || chBrace == '<') - direction = 1; - - pos = pos + direction; - while ((pos >= 0) && (pos < sci_get_length(sci))) - { - gchar chAtPos = sci_get_char_at(sci, pos - 1); - gint styAtPos = sci_get_style_at(sci, pos); - - if ((pos > sci_get_end_styled(sci)) || (styAtPos == styBrace)) - { - if (chAtPos == chBrace) - depth++; - if (chAtPos == chSeek) - depth--; - if (depth == 0) - return pos; - } - pos = pos + direction; - } - return - 1; -} - - gchar utils_brace_opposite(gchar ch) { switch (ch) Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2006-08-20 15:47:18 UTC (rev 750) +++ trunk/src/utils.h 2006-08-20 20:39:59 UTC (rev 751) @@ -87,8 +87,6 @@ void utils_set_fullscreen(void); -GtkFileFilter *utils_create_file_filter(filetype *ft); - void utils_update_tag_list(gint idx, gboolean update); gchar *utils_convert_to_utf8(const gchar *buffer, gsize size, gchar **used_encoding); @@ -107,8 +105,6 @@ //gchar *utils_get_current_tag(gint idx, gint direction); gint utils_get_current_function(gint idx, const gchar **tagname); -void utils_find_current_word(ScintillaObject *sci, gint pos, gchar *word, size_t wordlen); - /* returns the end-of-line character(s) length of the specified editor */ gint utils_get_eol_char_len(gint idx); @@ -141,12 +137,6 @@ gchar *utils_remove_ext_from_filename(const gchar *filename); -/* Finds a corresponding matching brace to the given pos - * (this is taken from Scintilla Editor.cxx, - * fit to work with sci_cb_close_block) */ -gint utils_brace_match(ScintillaObject *sci, gint pos); - - gchar utils_brace_opposite(gchar ch); gchar *utils_get_hostname(void); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [750] trunk
by eht16＠users.sourceforge.net 20 Aug '06

20 Aug '06

Revision: 750 Author: eht16 Date: 2006-08-20 08:47:18 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=750&view=rev Log Message: ----------- Moved prototype for geany_debug() to main.h. Moved declaration of document struct to document.h. Keep selection when commenting and uncommenting code. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/document.c trunk/src/document.h trunk/src/geany.h trunk/src/highlighting.c trunk/src/main.h trunk/src/sci_cb.c trunk/src/search.c trunk/src/templates.c trunk/src/utils.c trunk/src/vte.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-20 12:33:09 UTC (rev 749) +++ trunk/ChangeLog 2006-08-20 15:47:18 UTC (rev 750) @@ -1,3 +1,13 @@ +2006-08-20 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/build.c, src/document.c, src/document.h, src/geany.h, + src/highlighting.c, src/main.h, src/sci_cb.c, src/search.c, + src/templates.c, src/utils.c, src/vte.c: + Moved prototype for geany_debug() to main.h. + Moved declaration of document struct to document.h. + * src/sci_cb.c: Keep selection when commenting and uncommenting code. + + 2006-08-20 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/callbacks.c, src/main.c: Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-08-20 12:33:09 UTC (rev 749) +++ trunk/src/build.c 2006-08-20 15:47:18 UTC (rev 750) @@ -40,6 +40,7 @@ #include "dialogs.h" #include "msgwindow.h" #include "document.h" +#include "main.h" static gboolean build_iofunc(GIOChannel *ioc, GIOCondition cond, gpointer data); Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-08-20 12:33:09 UTC (rev 749) +++ trunk/src/document.c 2006-08-20 15:47:18 UTC (rev 750) @@ -55,6 +55,7 @@ #include "utils.h" #include "encodings.h" #include "notebook.h" +#include "main.h" /* Returns -1 if no text found or the new range endpoint after replacing. */ Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2006-08-20 12:33:09 UTC (rev 749) +++ trunk/src/document.h 2006-08-20 15:47:18 UTC (rev 750) @@ -24,7 +24,40 @@ #ifndef GEANY_DOCUMENT_H #define GEANY_DOCUMENT_H 1 +#include "geany.h" +/* structure for representing an open tab with all its related stuff. */ +typedef struct document +{ + gboolean is_valid; + gboolean has_tags; + // the filename is encoded in UTF-8, but every GLibC function expect the locale representation + gchar *file_name; + gchar *encoding; + gboolean has_bom; + filetype *file_type; + TMWorkObject *tm_file; + ScintillaObject *sci; + GtkWidget *tab_label; + GtkWidget *tabmenu_label; + GtkWidget *tag_tree; + GtkTreeStore *tag_store; + GtkTreeIter iter; + gboolean readonly; + gboolean changed; + gboolean do_overwrite; + gboolean line_breaking; + gboolean use_auto_indention; + time_t last_check; // to remember the last disk check + time_t mtime; +} document; + + +/* array of document elements to hold all information of the notebook tabs */ +document doc_list[GEANY_MAX_OPEN_FILES]; + + + /* returns the index of the notebook page which has the given filename */ gint document_find_by_filename(const gchar*, gboolean is_tm_filename); Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-08-20 12:33:09 UTC (rev 749) +++ trunk/src/geany.h 2006-08-20 15:47:18 UTC (rev 750) @@ -77,38 +77,6 @@ -/* structure for representing an open tab with all its related stuff. */ -typedef struct document -{ - gboolean is_valid; - gboolean has_tags; - // the filename is encoded in UTF-8, but every GLibC function expect the locale representation - gchar *file_name; - gchar *encoding; - gboolean has_bom; - filetype *file_type; - TMWorkObject *tm_file; - ScintillaObject *sci; - GtkWidget *tab_label; - GtkWidget *tabmenu_label; - GtkWidget *tag_tree; - GtkTreeStore *tag_store; - GtkTreeIter iter; - gboolean readonly; - gboolean changed; - gboolean do_overwrite; - gboolean line_breaking; - gboolean use_auto_indention; - time_t last_check; // to remember the last disk check - time_t mtime; -} document; - - - -/* array of document elements to hold all information of the notebook tabs */ -document doc_list[GEANY_MAX_OPEN_FILES]; - - /* store some pointers and variables for frequently used widgets */ typedef struct MyApp { @@ -253,8 +221,5 @@ GIGABYTE = (MEGABYTE*1024) }; -// implementation in main.c -void geany_debug(gchar const *format, ...); - #endif Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-08-20 12:33:09 UTC (rev 749) +++ trunk/src/highlighting.c 2006-08-20 15:47:18 UTC (rev 750) @@ -27,6 +27,7 @@ #include "highlighting.h" #include "sci_cb.h" #include "utils.h" +#include "main.h" static style_set *types[GEANY_MAX_FILE_TYPES] = { NULL }; Modified: trunk/src/main.h =================================================================== --- trunk/src/main.h 2006-08-20 12:33:09 UTC (rev 749) +++ trunk/src/main.h 2006-08-20 15:47:18 UTC (rev 750) @@ -27,4 +27,6 @@ void fifo_finalize(); +void geany_debug(gchar const *format, ...); + #endif Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-08-20 12:33:09 UTC (rev 749) +++ trunk/src/sci_cb.c 2006-08-20 15:47:18 UTC (rev 750) @@ -31,6 +31,7 @@ #include "document.h" #include "sciwrappers.h" #include "utils.h" +#include "main.h" static struct { @@ -910,15 +911,18 @@ void sci_cb_do_uncomment(gint idx) { - gint first_line; - gint last_line; + gint first_line, last_line; gint x, i, line_start, line_len; + gint sel_start, sel_end, co_len; gchar sel[64], *co, *cc; - gboolean break_loop = FALSE; + 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); + ft = doc_list[idx].file_type; first_line = sci_get_line_from_position(doc_list[idx].sci, @@ -941,6 +945,8 @@ cc = ft->comment_close; if (co == NULL) return; + co_len = strlen(co); + SSM(doc_list[idx].sci, SCI_BEGINUNDOACTION, 0, 0); for (i = first_line; (i <= last_line) && (! break_loop); i++) @@ -962,9 +968,10 @@ if (cc == NULL || strlen(cc) == 0) { guint i; - guint len = strlen(co); - switch (len) + single_line = TRUE; + + switch (co_len) { case 1: if (sel[x] != co[0]) continue; break; case 2: if (sel[x] != co[0] || sel[x+1] != co[1]) continue; break; @@ -973,8 +980,8 @@ default: continue; } - SSM(doc_list[idx].sci, SCI_GOTOPOS, line_start + x + len, 0); - for (i = 0; i < len; i++) SSM(doc_list[idx].sci, SCI_DELETEBACK, 0, 0); + 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); } // use multi line comment else @@ -1031,7 +1038,6 @@ len = sci_get_line_length(doc_list[idx].sci, line); linebuf = g_malloc(len + 1); sci_get_line(doc_list[idx].sci, line, linebuf); - geany_debug("%d", line); linebuf[len] = '\0'; x = 0; while (linebuf[x] != '\0' && isspace(linebuf[x])) x++; @@ -1046,20 +1052,36 @@ } } SSM(doc_list[idx].sci, SCI_ENDUNDOACTION, 0, 0); + + // restore selection + 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); + } } void sci_cb_do_comment(gint idx) { - gint first_line; - gint last_line; + gint first_line, last_line; gint x, i, line_start, line_len; + gint sel_start, sel_end, co_len; gchar sel[64], *co, *cc; - gboolean break_loop = FALSE; + 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); + ft = doc_list[idx].file_type; first_line = sci_get_line_from_position(doc_list[idx].sci, @@ -1082,6 +1104,8 @@ cc = ft->comment_close; if (co == NULL) return; + co_len = strlen(co); + SSM(doc_list[idx].sci, SCI_BEGINUNDOACTION, 0, 0); for (i = first_line; (i <= last_line) && (! break_loop); i++) @@ -1105,7 +1129,7 @@ /* 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; - switch (strlen(co)) + 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; @@ -1115,6 +1139,7 @@ } if (do_continue) continue; */ + single_line = TRUE; if (ft->comment_use_indent) sci_insert_text(doc_list[idx].sci, line_start + x, co); else @@ -1165,6 +1190,20 @@ } } SSM(doc_list[idx].sci, SCI_ENDUNDOACTION, 0, 0); + + // restore selection + 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); + } + } Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2006-08-20 12:33:09 UTC (rev 749) +++ trunk/src/search.c 2006-08-20 15:47:18 UTC (rev 750) @@ -28,6 +28,7 @@ #include "msgwindow.h" #include "document.h" #include "sciwrappers.h" +#include "main.h" #include <unistd.h> #include <string.h> Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2006-08-20 12:33:09 UTC (rev 749) +++ trunk/src/templates.c 2006-08-20 15:47:18 UTC (rev 750) @@ -27,6 +27,7 @@ #include "templates.h" #include "support.h" #include "utils.h" +#include "document.h" // some simple macros to reduce code size and make the code readable #define templates_get_filename(x) g_strconcat(app->configdir, G_DIR_SEPARATOR_S, x, NULL) Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-08-20 12:33:09 UTC (rev 749) +++ trunk/src/utils.c 2006-08-20 15:47:18 UTC (rev 750) @@ -49,6 +49,7 @@ #include "sciwrappers.h" #include "dialogs.h" #include "win32.h" +#include "main.h" #include "utils.h" Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2006-08-20 12:33:09 UTC (rev 749) +++ trunk/src/vte.c 2006-08-20 15:47:18 UTC (rev 750) @@ -35,6 +35,7 @@ #include "support.h" #include "utils.h" #include "callbacks.h" +#include "main.h" VteInfo vte_info; @@ -413,7 +414,7 @@ /* Taken from Terminal by os-cillation: terminal_screen_get_working_directory, thanks. - * Determinies the working directory using various OS-specific mechanisms. */ + * Determines the working directory using various OS-specific mechanisms. */ const gchar* vte_get_working_directory() { gchar buffer[4096 + 1]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [749] trunk
by ntrel＠users.sourceforge.net 20 Aug '06

20 Aug '06

Revision: 749 Author: ntrel Date: 2006-08-20 05:33:09 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=749&view=rev Log Message: ----------- Moved HAVE_FIFO MyApp fields to fifo_info struct in src/main.c; Prevent unnecessary 'does not look like a filename' debug messages Modified Paths: -------------- trunk/ChangeLog trunk/src/Makefile.am trunk/src/callbacks.c trunk/src/geany.h trunk/src/main.c Added Paths: ----------- trunk/src/main.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-20 11:54:33 UTC (rev 748) +++ trunk/ChangeLog 2006-08-20 12:33:09 UTC (rev 749) @@ -2,6 +2,11 @@ * src/callbacks.c, src/main.c: Fix opening more than one file from the command-line (with fifo). + * src/geany.h, src/callbacks.c, src/Makefile.am, src/main.c, + src/main.h: + Moved HAVE_FIFO MyApp fields to fifo_info struct in src/main.c. + Prevent unnecessary 'does not look like a filename' debug messages. + Added fifo_finalize(). 2006-08-19 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2006-08-20 11:54:33 UTC (rev 748) +++ trunk/src/Makefile.am 2006-08-20 12:33:09 UTC (rev 749) @@ -7,7 +7,7 @@ bin_PROGRAMS = geany SRCS = \ - main.c geany.h \ + main.c main.h geany.h \ search.c search.h \ notebook.c notebook.h \ keybindings.c keybindings.h \ Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-08-20 11:54:33 UTC (rev 748) +++ trunk/src/callbacks.c 2006-08-20 12:33:09 UTC (rev 749) @@ -49,8 +49,8 @@ #include "keybindings.h" #include "encodings.h" #include "search.h" +#include "main.h" - #ifdef G_OS_WIN32 # include "win32.h" #endif @@ -85,18 +85,8 @@ geany_debug("Quitting..."); #ifdef HAVE_FIFO - if (! app->ignore_fifo) - { - gchar *fifo = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, GEANY_FIFO_NAME, NULL); - // delete the fifo early, because we don't accept new files anymore - if (app->fifo_ioc != NULL) - { - g_io_channel_shutdown(app->fifo_ioc, FALSE, NULL); - g_io_channel_unref(app->fifo_ioc); - } - unlink(fifo); - g_free(fifo); - } + // delete the fifo early, because we don't accept new files anymore + fifo_finalize(); #endif keybindings_free(); Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-08-20 11:54:33 UTC (rev 748) +++ trunk/src/geany.h 2006-08-20 12:33:09 UTC (rev 749) @@ -168,10 +168,6 @@ gint autocompletion_max_height; gint long_line_type; gint long_line_column; -#ifdef HAVE_FIFO - gboolean ignore_fifo; - GIOChannel *fifo_ioc; -#endif gchar *long_line_color; gchar *pref_template_developer; gchar *pref_template_company; Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2006-08-20 11:54:33 UTC (rev 748) +++ trunk/src/main.c 2006-08-20 12:33:09 UTC (rev 749) @@ -57,8 +57,17 @@ #define N_(String) (String) + #ifdef HAVE_FIFO -static gchar fifo_name[512]; +static struct +{ + gboolean ignore_fifo; + gchar file_name[512]; + GIOChannel *read_ioc; +} fifo_info; +#endif + +#ifdef HAVE_FIFO static gboolean ignore_fifo = FALSE; #endif static gboolean debug_mode = FALSE; @@ -334,16 +343,18 @@ g_strstrip(buffer); // remove \n char // try to interpret the received data as a filename, otherwise do nothing - if (status == G_IO_STATUS_NORMAL && - g_file_test(buffer, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) + if (status == G_IO_STATUS_NORMAL) { - document_open_file(-1, buffer, 0, FALSE, NULL, NULL); - gtk_window_deiconify(GTK_WINDOW(app->window)); + if (g_file_test(buffer, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) + { + document_open_file(-1, buffer, 0, FALSE, NULL, NULL); + gtk_window_deiconify(GTK_WINDOW(app->window)); + } + else + { + geany_debug("got data from named pipe, but it does not look like a filename"); + } } - else - { - geany_debug("got data from named pipe, but it does not look like a filename"); - } g_free(buffer); return TRUE; // allow receiving more data @@ -355,7 +366,7 @@ gint i; GIOChannel *ioc; - ioc = g_io_channel_unix_new(open(fifo_name, O_WRONLY)); + ioc = g_io_channel_unix_new(open(fifo_info.file_name, O_WRONLY)); for(i = 1; i < argc && argv[i] != NULL; i++) { @@ -385,14 +396,14 @@ GIOChannel *ioc; tmp = g_strconcat(config_dir, G_DIR_SEPARATOR_S, GEANY_FIFO_NAME, NULL); - g_strlcpy(fifo_name, tmp, sizeof(fifo_name)); + g_strlcpy(fifo_info.file_name, tmp, sizeof(fifo_info.file_name)); g_free(tmp); - if (stat(fifo_name, &st) == 0 && (! S_ISFIFO(st.st_mode))) + if (stat(fifo_info.file_name, &st) == 0 && (! S_ISFIFO(st.st_mode))) { // the FIFO file exists, but is not a FIFO - unlink(fifo_name); + unlink(fifo_info.file_name); } - else if (stat(fifo_name, &st) == 0 && S_ISFIFO(st.st_mode)) + else if (stat(fifo_info.file_name, &st) == 0 && S_ISFIFO(st.st_mode)) { // FIFO exists, there should be a running instance of Geany if (argc > 1) { @@ -404,7 +415,7 @@ { if (dialogs_show_question(_("Geany is exiting because a named pipe was found. Mostly this means, Geany is already running. If you know Geany is not running, you can delete the file and start Geany anyway.\nDelete the named pipe and start Geany?"))) { - unlink(fifo_name); + unlink(fifo_info.file_name); } else exit(0); } @@ -413,17 +424,33 @@ // there is no Geany running, create fifo and start as usual, so we are a kind of server geany_debug("trying to create a new named pipe"); - if ((mkfifo(fifo_name, S_IRUSR | S_IWUSR)) == -1) + if ((mkfifo(fifo_info.file_name, S_IRUSR | S_IWUSR)) == -1) { if (errno != EEXIST) geany_debug("creating of a named pipe for IPC failed! (%s)", g_strerror(errno)); return NULL; } - ioc = g_io_channel_unix_new(open(fifo_name, O_RDONLY | O_NONBLOCK)); + ioc = g_io_channel_unix_new(open(fifo_info.file_name, O_RDONLY | O_NONBLOCK)); g_io_add_watch(ioc, G_IO_IN | G_IO_PRI, read_fifo, NULL); return ioc; } + + +void fifo_finalize() +{ + if (! fifo_info.ignore_fifo) + { + gchar *fifo = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, GEANY_FIFO_NAME, NULL); + if (fifo_info.read_ioc != NULL) + { + g_io_channel_shutdown(fifo_info.read_ioc, FALSE, NULL); + g_io_channel_unref(fifo_info.read_ioc); + } + unlink(fifo); + g_free(fifo); + } +} #endif @@ -510,7 +537,7 @@ app->configdir = g_strconcat(GEANY_HOME_DIR, G_DIR_SEPARATOR_S, ".", PACKAGE, NULL); #ifdef HAVE_FIFO - app->ignore_fifo = ignore_fifo; + fifo_info.ignore_fifo = ignore_fifo; #endif #ifdef HAVE_VTE vte_info.lib_vte = lib_vte; @@ -570,7 +597,7 @@ config_dir_result = setup_config_dir(); // handle fifo #ifdef HAVE_FIFO - app->fifo_ioc = (ignore_fifo) ? NULL : create_fifo(argc, argv, app->configdir); + fifo_info.read_ioc = (ignore_fifo) ? NULL : create_fifo(argc, argv, app->configdir); #endif gtk_init(&argc, &argv); Added: trunk/src/main.h =================================================================== --- trunk/src/main.h (rev 0) +++ trunk/src/main.h 2006-08-20 12:33:09 UTC (rev 749) @@ -0,0 +1,30 @@ +/* + * main.h - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $Id$ + */ + + +#ifndef GEANY_MAIN_H +#define GEANY_MAIN_H + +void fifo_finalize(); + +#endif Property changes on: trunk/src/main.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [748] trunk/src
by ntrel＠users.sourceforge.net 20 Aug '06

20 Aug '06

Revision: 748 Author: ntrel Date: 2006-08-20 04:54:33 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=748&view=rev Log Message: ----------- Add info to file header text Modified Paths: -------------- trunk/src/notebook.c trunk/src/notebook.h trunk/src/search.c trunk/src/search.h Modified: trunk/src/notebook.c =================================================================== --- trunk/src/notebook.c 2006-08-20 11:40:09 UTC (rev 747) +++ trunk/src/notebook.c 2006-08-20 11:54:33 UTC (rev 748) @@ -1,6 +1,7 @@ /* * notebook.c - this file is part of Geany, a fast and lightweight IDE * + * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/notebook.h =================================================================== --- trunk/src/notebook.h 2006-08-20 11:40:09 UTC (rev 747) +++ trunk/src/notebook.h 2006-08-20 11:54:33 UTC (rev 748) @@ -1,6 +1,7 @@ /* * notebook.h - this file is part of Geany, a fast and lightweight IDE * + * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2006-08-20 11:40:09 UTC (rev 747) +++ trunk/src/search.c 2006-08-20 11:54:33 UTC (rev 748) @@ -1,6 +1,7 @@ /* - * search.c + * search.c - this file is part of Geany, a fast and lightweight IDE * + * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/search.h =================================================================== --- trunk/src/search.h 2006-08-20 11:40:09 UTC (rev 747) +++ trunk/src/search.h 2006-08-20 11:54:33 UTC (rev 748) @@ -1,6 +1,7 @@ /* - * search.h + * search.h - this file is part of Geany, a fast and lightweight IDE * + * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [747] trunk
by ntrel＠users.sourceforge.net 20 Aug '06

20 Aug '06

Revision: 747 Author: ntrel Date: 2006-08-20 04:40:09 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=747&view=rev Log Message: ----------- Fix opening more than one file from the command-line (with fifo) Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/main.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-19 15:07:11 UTC (rev 746) +++ trunk/ChangeLog 2006-08-20 11:40:09 UTC (rev 747) @@ -1,3 +1,9 @@ +2006-08-20 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/callbacks.c, src/main.c: + Fix opening more than one file from the command-line (with fifo). + + 2006-08-19 Enrico Tröger <enrico.troeger(a)uvena.de> * geany.glade, src/interface.c, src/keybindings.c, src/utils.c, Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-08-19 15:07:11 UTC (rev 746) +++ trunk/src/callbacks.c 2006-08-20 11:40:09 UTC (rev 747) @@ -91,8 +91,8 @@ // delete the fifo early, because we don't accept new files anymore if (app->fifo_ioc != NULL) { + g_io_channel_shutdown(app->fifo_ioc, FALSE, NULL); g_io_channel_unref(app->fifo_ioc); - g_io_channel_shutdown(app->fifo_ioc, FALSE, NULL); } unlink(fifo); g_free(fifo); Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2006-08-19 15:07:11 UTC (rev 746) +++ trunk/src/main.c 2006-08-20 11:40:09 UTC (rev 747) @@ -331,9 +331,11 @@ //status = g_io_channel_read_to_end(source, &buffer, &len, NULL); status = g_io_channel_read_line(source, &buffer, &len, NULL, NULL); + g_strstrip(buffer); // remove \n char // try to interpret the received data as a filename, otherwise do nothing - if (g_file_test(buffer, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) + if (status == G_IO_STATUS_NORMAL && + g_file_test(buffer, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) { document_open_file(-1, buffer, 0, FALSE, NULL, NULL); gtk_window_deiconify(GTK_WINDOW(app->window)); @@ -344,16 +346,7 @@ } g_free(buffer); - if (status != G_IO_STATUS_NORMAL) - return TRUE; - else - { - g_io_channel_unref(app->fifo_ioc); - g_io_channel_shutdown(app->fifo_ioc, FALSE, NULL); - app->fifo_ioc = g_io_channel_unix_new(open(fifo_name, O_RDONLY | O_NONBLOCK)); - g_io_add_watch(app->fifo_ioc, G_IO_IN | G_IO_PRI, read_fifo, NULL); - return FALSE; - } + return TRUE; // allow receiving more data } @@ -362,19 +355,24 @@ gint i; GIOChannel *ioc; + ioc = g_io_channel_unix_new(open(fifo_name, O_WRONLY)); + for(i = 1; i < argc && argv[i] != NULL; i++) { gchar *filename = get_argv_filename(argv[i]); if (filename && g_file_test(filename, G_FILE_TEST_IS_REGULAR || G_FILE_TEST_IS_SYMLINK)) { - ioc = g_io_channel_unix_new(open(fifo_name, O_WRONLY)); g_io_channel_write_chars(ioc, filename, -1, NULL, NULL); + g_io_channel_write_chars(ioc, "\n", -1, NULL, NULL); // each line has one file g_io_channel_flush(ioc, NULL); - g_io_channel_shutdown(ioc, TRUE, NULL); } + else + g_printerr(_("Could not find file \"%s\".\n"), filename); g_free(filename); } + g_io_channel_shutdown(ioc, TRUE, NULL); + g_io_channel_unref(ioc); } 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 August 2006